fixed #255 and made some other improvements to the subscription mgmt