- Added unsubscribe and better comments