Ejm paperedits

Mostly responding to/incorporating @jimallman comments.