Bug fixes
small tweaks to generated config files
Merge pull request #296 from clovis/master

Bug fixes and tweaks