Fix issue #43

* Work on messaging
* Fix issue # 43
* Fix typos in comments