Added remaining Geometry implementation.
Fixing whitespace.