fixed name bug
more routine subscribing stuff