Fixed structure of config file and added some defaults intot he code