Fixed some structural problems. DefaultPlayer is now Player