Add subscriptions to feed, fix some bugs