More stuff

Just some more fixes and features