some refactoring
chatter plugin done right
patch out broken behavior for now