Gamemode

And minor misc changes