Added todo, fixed player constructor