More refactoring of Player stuff

Bug: The jump key stops trigerring at some point for an unknown reason.