Fixes
beginnings of emulator