Corrected an error that caused an exception in add-command.
Spelling errors removed, TODOs added
Merge branch 'master' of https://github.com/Tobchen/TobyHML