Update on forgetting points, some cleaning up of code.