Add some gamemodes, clean up a bit

Removed some useless/unneeded stuff and added in a few well-known
gamemodes to the command whitelist