Merge pull request #1 from ged-lab/mrc-fixes

mrc's first pass revisions (on the correct branch)
fiz
Minor tweaks