lots of stability improvements (i.e. subscribing)