lots of fixes and changes to config.yaml