Cleaning things up a bit. Still modifying the Player to cover javafx's idiosyncrasies.