cleaned up, and made ready for server