Break up some stuff, address a few small issues