Minor speed improvements, add timing everywhere
Back to objects for points, it was getting hard to read.