Lots of small changes, preparing for final touches.

Signed-off-by: Attila Fodor <attila.fodor.89@gmail.com>