fixing bugs & adding subscriptions