Edits to Tube and GeomBase