Minor fixes, new Player class