most things cleaned up and ready (nearly) for a deploy