UNSTABLE: merging some minor changes/bug fixes from other machine.
Some bug fixes including an ugly hack in RonClient that needs to be fixed later.  Seems stable, but could have some bizarre effects when we get into longer-term simulations...