fixes lots of config changes and errors