Work on Geometry, Triangle, and various cleanup