Cleanup
Support for alternative cfg file
Prettier format for options etc
Change error message