added new geoms
knocked off a couple more geoms