Fixing two small group bugs
Adding watershed output to mfx
Flexible subject specification