Cleanup

some more small cleanups

Merge if you want, or wait for more small fixes :)