Fixes geom compatibility, improves javadoc