Added some choices to adgame and cleaned up code