decoding changes and MEE fixes