Morrect merge + eeprom corrections