adhering closer to EVE standard, disregarding envelopes from eve-core. Simulator updates