Update config files
Update config files
Minor bug fixes