Activity stream enhancements.

Re-submitting this as the commit seems to have been overwritten.