renamed config variables and fixed other minor issues