Pull request for things that start with the letter E

It's my favorite letter, it deserves more love.

Fixes #672