gen dump and more geom fixes