Added lots of config options
Improved initial settings