Improve stringification
Fix subscription and unsubscription
Merge pull request #9 from drkitty/model-changes

Model changes