Initial bug fixes.
QQ
Squashed em
Comment maintenance
Merge pull request #123 from Seneca-CDOT/issue119

Issue119