Fixing batchSubscribe to work properly

also fixing comments for subscribe/batch-subscribe