General improvements to playability