Cleaning up for release, nearly there!