more geom type fixes and general cleanup