Add some E logic, general updates