Hcg devel2

Hi Chris, Adam,

Thanks for the start!  Here are a few tweaks: mostly they restore the historical RA1-behavior, so that we can merge into master.  If they look ok to you, then please merge this PR (into hcg-devel), and subsequently merge #298 (into master).

Ted