eem, fixed some things