emu - various bug fixed