fixed some variable renaming issues and scoping issues that went along with the new config method