Added GameMode enum, some cleanup