Cleaning, tweaking and additions

So, plenty of changes!