DONE: Geometry
+ minor changes