Misc

Lots of small changes