Big changes!

Cleaning, tweaking and fixing aswell.