updated config files; code cleanup