Fixed typos, added more specs for subscriptions