Misc cleanups

@lewolff could you have a look? This is very lightly tested.

And @vairoli if you could help with testing that would be great.

This should be merged after !20 (merged)