Changed Type to PlayerType, and some more changes