command/unsubscribe implementation; command/subscribe fix