Merge esper's edits.

See the full log of commits for details; there are a variety of edits.