improvements to expression engine