fixed all issues except subscriptions