Various game play tweaks and fixes