minor updates & now emulator works