Improvements and prep work for next phase (multiplayer).