more stuff

fixed EGM stuff
working on TM and HM