Some nasty changes.

Signed-off-by: Patryk A. Wertka <spartanpageagain@gmail.com>