Last commit

Loads of small changes and fixes.