cleaned up a bit.
modified quit namespace collision >_>