cleanups and corrections to ELens
ESetter signature fix (thanks elliott!)