fixed poblem prevent emulation from starting, other changes