more geom for tiny stuff, major refactor