Worked on some odds and ends, mainly in e2, concerning difficult encoding
Merge pull request #294 from alevan2/master

Worked on some odds and ends, mainly in e2, concerning difficult encodin...