Restructuring fixes

[x] Help text formatting
[x] Error subclass ends in "Error"
more to come