Added geometry types
Geometry clean up
Re-tidied up geometry contains checking