Error suffix
Automatically generated help texts
Merge pull request #353 from stefanpenner/restructuring-fixes

Restructuring fixes