Dave fixes

Dave made improvements to two areas:

1) Shared Editing Context

2) ERXKey