fixes + config files moved