Small changes in config, removed debug print statements