Fix syntax error in config
Fix a few minor bugs