Reviewed code, added some TODOs

Useless (because not referenced elsewhere) class Player has been removed