Fixes

All kinds of stuff
commit messages should explain