More Improvements

* Handle disambiguation
* Improve `parseMessage` logic somewhat
* General cleanup