Some clean-up and a new player type