Improve a few things with the player handling system