lots of things cleaned up