#57 misc fixes to sub and unsub