Advocate pivot

Started as changes to language on one of the activities. Includes a bunch of other housekeeping fixes.