Added graceful quitting
Clarified some things and tided the configuration methods