Fixed the points system.
Found more problems and added TODOs.