subscription support and minor fixes