bugfix handling unsubscribes via MC; comment fixes and tpl update