small fixes and work on subscription interface