removed unsubscribe/subscribe functionality.  Oops!
Fixed ordering to be alphabetical