latest erh changes

Pushed from cloudpebble, just in case