Developing class player

Tiny changes across other classes