Improve stringification
Fix subscription and unsubscription