Fixing geometry

Work on extrusions and circles. Still a bit to go.