Merging in stuff on Participation from Paul
Fixing some dups