Tidy up
Work in progress on the torus