final commit for now, more EEMT script fixing