Added configuration settings.
Okay, more cleanup and progress.