Bug fixes and method clean up in the geometry classes