minor fixes for better playability