Add subscriptions endpoints, some minor fixes, update from latest draft