Fixes to Game State, Prep for Pickups