Not a very structure changeset

Lots of tweaks and fixes to various issues :)