code review upgrades, added config file fixes #1