Fixed the points, and a lot of other stuff