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

...g