bugfix handling unsubscribes via MC; comment fixes and tpl update

Couple of minor bits and one major bugfix!