Geometry methods and BasicMath edits