diff --git a/.github/workflows/cmake-mingw.yml b/.github/workflows/cmake-mingw.yml
index b69f4cf84..56942e694 100644
--- a/.github/workflows/cmake-mingw.yml
+++ b/.github/workflows/cmake-mingw.yml
@@ -49,4 +49,3 @@ jobs:
 #    - name: Test
 #      working-directory: ${{github.workspace}}/build
 #      run: ctest --verbose -C ${{env.BUILD_TYPE}}
-    
diff --git a/.github/workflows/cmake-ubuntu.yml b/.github/workflows/cmake-ubuntu.yml~HEAD
similarity index 100%
rename from .github/workflows/cmake-ubuntu.yml
rename to .github/workflows/cmake-ubuntu.yml~HEAD
diff --git a/.github/workflows/cmake-ubuntu.yml~dev b/.github/workflows/cmake-ubuntu.yml~dev
new file mode 100644
index 000000000..9ce3a63df
--- /dev/null
+++ b/.github/workflows/cmake-ubuntu.yml~dev
@@ -0,0 +1,30 @@
+name: CMake-Ubuntu
+
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: '40 5 * * *'
+    
+env:
+  BUILD_TYPE: Release
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Configure CMake
+      working-directory: ./Emulator
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+
+    - name: Build
+      working-directory: ./Emulator
+      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+
+    - name: Test
+      working-directory: ${{github.workspace}}/build
+      run: ctest --verbose -C ${{env.BUILD_TYPE}}
+      
diff --git a/Emulator/Agnus/Agnus.cpp b/Emulator/Agnus/Agnus.cpp
index eaab5c771..7aee50387 100644
--- a/Emulator/Agnus/Agnus.cpp
+++ b/Emulator/Agnus/Agnus.cpp
@@ -15,7 +15,7 @@ namespace vamiga {
 
 Agnus::Agnus(Amiga& ref) : SubComponent(ref)
 {    
-    subComponents = std::vector<AmigaComponent *> {
+    subComponents = std::vector<CoreComponent *> {
         
         &sequencer,
         &copper,
@@ -151,9 +151,6 @@ Agnus::setVideoFormat(VideoFormat newFormat)
     // Clear frame buffers
     denise.pixelEngine.clearAll();
 
-    // Let the audio engine know about the speed change
-    paula.muxer.adjustSpeed();
-
     // Inform the GUI
     msgQueue.put(MSG_VIDEO_FORMAT, newFormat);
 }
diff --git a/Emulator/Agnus/Agnus.h b/Emulator/Agnus/Agnus.h
index c04f35cf9..7c5651955 100644
--- a/Emulator/Agnus/Agnus.h
+++ b/Emulator/Agnus/Agnus.h
@@ -208,7 +208,7 @@ class Agnus : public SubComponent {
 
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 private:
@@ -218,7 +218,7 @@ class Agnus : public SubComponent {
 
     
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
     
 private:
@@ -341,8 +341,8 @@ class Agnus : public SubComponent {
     
 public:
     
-    AgnusInfo getInfo() const { return AmigaComponent::getInfo(info); }
-    EventInfo getEventInfo() const { return AmigaComponent::getInfo(eventInfo); }
+    AgnusInfo getInfo() const { return CoreComponent::getInfo(info); }
+    EventInfo getEventInfo() const { return CoreComponent::getInfo(eventInfo); }
     EventSlotInfo getSlotInfo(isize nr) const;
     const AgnusStats &getStats() { return stats; }
     
@@ -673,14 +673,6 @@ class Agnus : public SubComponent {
         scheduleAbs<s>(clock + cycle, id, data);
     }
 
-    /*
-     template<EventSlot s> void schedulePos(Beam target, EventID id, i64 data) {
-
-     assert(target.v > pos.v || (target.v == pos.v && target.h >= pos.h));
-     scheduleRel<s>(DMA_CYCLES(pos.diff(target.v, target.h)), id, data);
-     }
-     */
-
     template<EventSlot s> void schedulePos(isize vpos, isize hpos, EventID id) {
 
         assert(vpos > pos.v || (vpos == pos.v && hpos >= pos.h));
@@ -697,12 +689,6 @@ class Agnus : public SubComponent {
         rescheduleAbs<s>(clock + cycle);
     }
 
-    /*
-     template<EventSlot s> void reschedulePos(Beam pos) {
-     rescheduleAbs<s>(beamToCycle(pos));
-     }
-     */
-
     template<EventSlot s> void reschedulePos(i16 vpos, i16 hpos) {
 
         assert(vpos > pos.v || (vpos == pos.v && hpos >= pos.h));
diff --git a/Emulator/Agnus/AgnusInfo.cpp b/Emulator/Agnus/AgnusInfo.cpp
index 0170511dd..ce77d935c 100644
--- a/Emulator/Agnus/AgnusInfo.cpp
+++ b/Emulator/Agnus/AgnusInfo.cpp
@@ -646,13 +646,15 @@ Agnus::_dump(Category category, std::ostream& os) const
     }
     
     if (category == Category::Events) {
+
+        inspect();
         
         os << std::left << std::setw(10) << "Slot";
         os << std::left << std::setw(14) << "Event";
         os << std::left << std::setw(18) << "Trigger position";
         os << std::left << std::setw(16) << "Trigger cycle" << std::endl;
         
-        for (isize i = 0; i < 23; i++) {
+        for (isize i = 0; i < SLOT_COUNT; i++) {
             
             EventSlotInfo &info = slotInfo[i];
             
@@ -762,7 +764,7 @@ Agnus::inspectSlot(EventSlot nr) const
     info.hpos = beam.h;
     info.frameRel = long(beam.frame - pos.frame);
 
-    info.eventName = agnus.eventName((EventSlot)nr, id[nr]);
+    info.eventName = eventName((EventSlot)nr, id[nr]);
 }
 
 EventSlotInfo
diff --git a/Emulator/Agnus/AgnusTypes.h b/Emulator/Agnus/AgnusTypes.h
index 5c0b77440..1ac0e54ea 100644
--- a/Emulator/Agnus/AgnusTypes.h
+++ b/Emulator/Agnus/AgnusTypes.h
@@ -384,12 +384,14 @@ enum_i8(EventID)
     INS_EVENT_COUNT
 };
 
+/*
 static inline bool isRegEvent(EventID id) { return id < REG_EVENT_COUNT; }
 static inline bool isCiaEvent(EventID id) { return id < CIA_EVENT_COUNT; }
 static inline bool isBplEvent(EventID id) { return id < BPL_EVENT_COUNT; }
 static inline bool isDasEvent(EventID id) { return id < DAS_EVENT_COUNT; }
 static inline bool isCopEvent(EventID id) { return id < COP_EVENT_COUNT; }
 static inline bool isBltEvent(EventID id) { return id < BLT_EVENT_COUNT; }
+*/
 
 static inline bool isBplxEvent(EventID id, int x)
 {
diff --git a/Emulator/Agnus/Blitter/Blitter.cpp b/Emulator/Agnus/Blitter/Blitter.cpp
index 04b825f77..3a0ed1795 100644
--- a/Emulator/Agnus/Blitter/Blitter.cpp
+++ b/Emulator/Agnus/Blitter/Blitter.cpp
@@ -44,7 +44,7 @@ Blitter::Blitter(Amiga& ref) : SubComponent(ref)
 void
 Blitter::_initialize()
 {
-    AmigaComponent::_initialize();
+    CoreComponent::_initialize();
     
     initFastBlitter();
     initSlowBlitter();
diff --git a/Emulator/Agnus/Blitter/Blitter.h b/Emulator/Agnus/Blitter/Blitter.h
index e8916e94e..bebbca50c 100644
--- a/Emulator/Agnus/Blitter/Blitter.h
+++ b/Emulator/Agnus/Blitter/Blitter.h
@@ -191,7 +191,7 @@ class Blitter : public SubComponent
     
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 private:
@@ -201,7 +201,7 @@ class Blitter : public SubComponent
     
     
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
     
 private:
@@ -301,7 +301,7 @@ class Blitter : public SubComponent
     
 public:
     
-    BlitterInfo getInfo() const { return AmigaComponent::getInfo(info); }
+    BlitterInfo getInfo() const { return CoreComponent::getInfo(info); }
     
     
     //
diff --git a/Emulator/Agnus/Copper/Copper.cpp b/Emulator/Agnus/Copper/Copper.cpp
index 4c377ac08..0dba54e5c 100644
--- a/Emulator/Agnus/Copper/Copper.cpp
+++ b/Emulator/Agnus/Copper/Copper.cpp
@@ -19,7 +19,7 @@ namespace vamiga {
 
 Copper::Copper(Amiga& ref) : SubComponent(ref)
 {
-    subComponents = std::vector<AmigaComponent *> {
+    subComponents = std::vector<CoreComponent *> {
         
         &debugger
     };
diff --git a/Emulator/Agnus/Copper/Copper.h b/Emulator/Agnus/Copper/Copper.h
index ce7f4f1c2..f020510e8 100644
--- a/Emulator/Agnus/Copper/Copper.h
+++ b/Emulator/Agnus/Copper/Copper.h
@@ -96,7 +96,7 @@ class Copper : public SubComponent
 
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 private:
@@ -106,7 +106,7 @@ class Copper : public SubComponent
 
     
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
     
 private:
@@ -150,7 +150,7 @@ class Copper : public SubComponent
 public:
     
     // Returns the result of the latest inspection
-    CopperInfo getInfo() const { return AmigaComponent::getInfo(info); }
+    CopperInfo getInfo() const { return CoreComponent::getInfo(info); }
 
 
     //
diff --git a/Emulator/Agnus/Copper/CopperDebugger.cpp b/Emulator/Agnus/Copper/CopperDebugger.cpp
index 5afb37751..53e1b7ca9 100644
--- a/Emulator/Agnus/Copper/CopperDebugger.cpp
+++ b/Emulator/Agnus/Copper/CopperDebugger.cpp
@@ -40,6 +40,22 @@ CopperDebugger::_dump(Category category, std::ostream& os) const
 {
     using namespace util;
 
+    auto print = [&](const string &name, const moira::Guards &guards) {
+
+        for (int i = 0; i < guards.elements(); i++) {
+
+            auto bp =  guards.guardNr(i);
+            auto nr = name + std::to_string(i);
+
+            os << tab(nr);
+            os << hex(bp->addr);
+
+            if (!bp->enabled) os << " (Disabled)";
+            else if (bp->ignore) os << " (Disabled for " << dec(bp->ignore) << " hits)";
+            os << std::endl;
+        }
+    };
+
     if (!amiga.inDebugMode()) {
         
         os << "No recorded data. Debug mode is off." << std::endl;
@@ -63,18 +79,20 @@ CopperDebugger::_dump(Category category, std::ostream& os) const
     }
     
     if (category == Category::Breakpoints) {
-        
-        for (int i = 0; i < breakpoints.elements(); i++) {
-            
-            auto bp = breakpoints.guardNr(i);
-            auto nr = "Breakpoint " + std::to_string(i);
-            
-            os << util::tab(nr);
-            os << util::hex(bp->addr);
 
-            if (!bp->enabled) os << " (Disabled)";
-            else if (bp->ignore) os << " (Disabled for " << bp->ignore << " hits)";
-            os << std::endl;
+        if (breakpoints.elements()) {
+            print("Breakpoint", breakpoints);
+        } else {
+            os << "No breakpoints set" << std::endl;
+        }
+    }
+
+    if (category == Category::Watchpoints) {
+
+        if (watchpoints.elements()) {
+            print("Watchpoint", watchpoints);
+        } else {
+            os << "No watchpoints set" << std::endl;
         }
     }
 }
diff --git a/Emulator/Agnus/Copper/CopperDebugger.h b/Emulator/Agnus/Copper/CopperDebugger.h
index 0d4d3d8a7..31250ad06 100644
--- a/Emulator/Agnus/Copper/CopperDebugger.h
+++ b/Emulator/Agnus/Copper/CopperDebugger.h
@@ -72,7 +72,7 @@ class CopperDebugger: public SubComponent {
 
 
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 private:
@@ -82,7 +82,7 @@ class CopperDebugger: public SubComponent {
     
     
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
 
 private:
diff --git a/Emulator/Agnus/DmaDebugger/DmaDebugger.h b/Emulator/Agnus/DmaDebugger/DmaDebugger.h
index 4e4258986..1ce1496dd 100644
--- a/Emulator/Agnus/DmaDebugger/DmaDebugger.h
+++ b/Emulator/Agnus/DmaDebugger/DmaDebugger.h
@@ -48,7 +48,7 @@ class DmaDebugger : public SubComponent {
 
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 private:
@@ -58,7 +58,7 @@ class DmaDebugger : public SubComponent {
 
     
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
     
 private:
diff --git a/Emulator/Agnus/Sequencer/Sequencer.h b/Emulator/Agnus/Sequencer/Sequencer.h
index bbd95f3f7..97766e59b 100644
--- a/Emulator/Agnus/Sequencer/Sequencer.h
+++ b/Emulator/Agnus/Sequencer/Sequencer.h
@@ -210,7 +210,7 @@ class Sequencer : public SubComponent
 
 
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
 
 private:
@@ -220,7 +220,7 @@ class Sequencer : public SubComponent
 
 
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
 
 private:
diff --git a/Emulator/Amiga.cpp b/Emulator/Amiga.cpp
index b362bb8fb..15528a010 100644
--- a/Emulator/Amiga.cpp
+++ b/Emulator/Amiga.cpp
@@ -62,7 +62,7 @@ Amiga::Amiga()
      * - Memory must preceed the CPU, because it contains the CPU reset vector.
      */
     
-    subComponents = std::vector<AmigaComponent *> {
+    subComponents = std::vector<CoreComponent *> {
 
         &agnus,
         &rtc,
@@ -103,10 +103,7 @@ Amiga::Amiga()
 
     // Initialize the sync timer
     targetTime = util::Time::now();
-    
-    // Start the thread and enter the main function
-    thread = std::thread(&Thread::main, this);
-    
+
     // Print some debug information
     if constexpr (SNP_DEBUG) {
         
@@ -138,10 +135,20 @@ Amiga::Amiga()
 
 Amiga::~Amiga()
 {
-    debug(RUN_DEBUG, "Destroying Amiga\n");
+    debug(RUN_DEBUG, "Destroying emulator instance\n");
     if (thread.joinable()) { halt(); }
 }
 
+void
+Amiga::launch()
+{
+    if (!thread.joinable()) {
+
+        thread = std::thread(&Thread::main, this);
+        assert(thread.joinable());
+    }
+}
+
 void
 Amiga::prefix() const
 {
@@ -180,7 +187,7 @@ Amiga::reset(bool hard)
     df3.serviceDiskChangeEvent <SLOT_DC3> ();
     
     // Execute the standard reset routine
-    AmigaComponent::reset(hard);
+    CoreComponent::reset(hard);
     
     if (!isEmulatorThread()) resume();
 
@@ -205,7 +212,8 @@ Amiga::resetConfig()
     std::vector <Option> options = {
 
         OPT_VIDEO_FORMAT,
-        OPT_VSYNC
+        OPT_SYNC_MODE,
+        OPT_PROPOSED_FPS
     };
 
     for (auto &option : options) {
@@ -222,9 +230,13 @@ Amiga::getConfigItem(Option option) const
 
             return config.type;
 
-        case OPT_VSYNC:
+        case OPT_SYNC_MODE:
+
+            return config.syncMode;
+
+        case OPT_PROPOSED_FPS:
 
-            return config.vsync;
+            return config.proposedFps;
 
         case OPT_AGNUS_REVISION:
         case OPT_SLOW_RAM_MIRROR:
@@ -397,6 +409,10 @@ Amiga::setConfigItem(Option option, i64 value)
 
         case OPT_VIDEO_FORMAT:
 
+            if (!VideoFormatEnum::isValid(value)) {
+                throw VAError(ERROR_OPT_INVARG, VideoFormatEnum::keyList());
+            }
+
             if (value != config.type) {
 
                 SUSPENDED
@@ -406,15 +422,22 @@ Amiga::setConfigItem(Option option, i64 value)
             }
             return;
 
-        case OPT_VSYNC:
+        case OPT_SYNC_MODE:
 
-            if (bool(value) != config.vsync) {
+            if (!SyncModeEnum::isValid(value)) {
+                throw VAError(ERROR_OPT_INVARG, SyncModeEnum::keyList());
+            }
 
-                SUSPENDED
+            config.syncMode = SyncMode(value);
+            return;
 
-                config.vsync = bool(value);
-                paula.muxer.adjustSpeed();
+        case OPT_PROPOSED_FPS:
+
+            if (value < 25 || value > 120) {
+                throw VAError(ERROR_OPT_INVARG, "25...120");
             }
+
+            config.proposedFps = value;
             return;
 
         default:
@@ -453,7 +476,8 @@ Amiga::configure(Option option, i64 value)
     switch (option) {
 
         case OPT_VIDEO_FORMAT:
-        case OPT_VSYNC:
+        case OPT_SYNC_MODE:
+        case OPT_PROPOSED_FPS:
             
             setConfigItem(option, value);
             break;
@@ -721,8 +745,9 @@ Amiga::configure(Option option, long id, i64 value)
             break;
             
         case OPT_PULLUP_RESISTORS:
+        case OPT_SHAKE_DETECTION:
         case OPT_MOUSE_VELOCITY:
-            
+
             assert(id == ControlPort::PORT1 || id == ControlPort::PORT2);
             if (id == ControlPort::PORT1) controlPort1.mouse.setConfigItem(option, value);
             if (id == ControlPort::PORT2) controlPort2.mouse.setConfigItem(option, value);
@@ -907,58 +932,55 @@ Amiga::_dump(Category category, std::ostream& os) const
 
         os << tab("Machine type");
         os << VideoFormatEnum::key(config.type) << std::endl;
-        os << tab("Vertical sync");
-        os << bol(config.vsync) << std::endl;
+        os << tab("Sync mode");
+        os << SyncModeEnum::key(config.syncMode);
+        if (config.syncMode == SYNC_FIXED_FPS) os << " (" << config.proposedFps << " fps)";
+        os << std::endl;
     }
 
     if (category == Category::Inspection) {
 
-        os << tab("Thread state");
-        os << ExecutionStateEnum::key(state) << std::endl;
+        os << tab("Power");
+        os << bol(isPoweredOn()) << std::endl;
+        os << tab("Running");
+        os << bol(isRunning()) << std::endl;
+        os << tab("Suspended");
+        os << bol(isSuspended()) << std::endl;
+        os << tab("Warp mode");
+        os << bol(inWarpMode()) << std::endl;
+        os << tab("Debug mode");
+        os << bol(inDebugMode()) << std::endl;
         os << std::endl;
-        os << tab("Current frame");
+        os << tab("Refresh rate");
+        os << dec(isize(refreshRate())) << " Fps" << std::endl;
+    }
+
+    if (category == Category::Progress) {
+
+        os << tab("Frame");
         os << dec(agnus.pos.frame) << std::endl;
         os << tab("CPU progress");
-        os << dec(cpu.getCpuClock()) << " CPU cycles" << std::endl;
-        os << tab("");
-        os << dec(cpu.getMasterClock()) << " Master cycles" << std::endl;
+        os << dec(cpu.getMasterClock()) << " Master cycles (";
+        os << dec(cpu.getCpuClock()) << " CPU cycles)" << std::endl;
         os << tab("Agnus progress");
-        os << dec(agnus.clock) << " DMA cycles" << std::endl;
-        os << tab("");
-        os << dec(DMA_CYCLES(agnus.clock)) << " Master cycles" << std::endl;
+        os << dec(agnus.clock) << " Master cycles (";
+        os << dec(AS_DMA_CYCLES(agnus.clock)) << " DMA cycles)" << std::endl;
         os << tab("CIA A progress");
-        os << dec(ciaA.getClock()) << " CIA cycles" << std::endl;
-        os << tab("");
-        os << dec(CIA_CYCLES(ciaA.getClock())) << " Master cycles" << std::endl;
+        os << dec(ciaA.getClock()) << " Master cycles (";
+        os << dec(AS_CIA_CYCLES(ciaA.getClock())) << " CIA cycles)" << std::endl;
         os << tab("CIA B progress");
-        os << dec(ciaB.getClock()) << " CIA cycles" << std::endl;
-        os << tab("");
-        os << dec(CIA_CYCLES(ciaA.getClock())) << " Master cycles" << std::endl;
+        os << dec(ciaB.getClock()) << " Master cycles (";
+        os << dec(AS_CIA_CYCLES(ciaA.getClock())) << " CIA cycles)" << std::endl;
     }
 
     if (category == Category::Debug) {
 
         os << tab("Thread state");
         os << ExecutionStateEnum::key(state) << std::endl;
-        os << tab("Sync mode");
-        os << (getSyncMode() == SyncMode::Periodic ? "PERIODIC" : "PULSED") << std::endl;
-
-        os << std::endl;
+        os << tab("Thread mode");
+        os << (getThreadMode() == ThreadMode::Periodic ? "PERIODIC" : "PULSED") << std::endl;
         os << tab("Master clock frequency");
         os << flt(masterClockFrequency() / float(1000000.0)) << " MHz" << std::endl;
-        os << tab("Amiga refresh rate");
-        os << flt(float(refreshRate())) << " Hz" << std::endl;
-        os << tab("Power");
-        os << bol(isPoweredOn()) << std::endl;
-        os << tab("Running");
-        os << bol(isRunning()) << std::endl;
-        os << tab("Suspended");
-        os << bol(isSuspended()) << std::endl;
-        os << tab("Warp mode");
-        os << bol(inWarpMode()) << std::endl;
-        os << tab("Debug mode");
-        os << bol(inDebugMode()) << std::endl;
-
     }
 
     if (category == Category::Defaults) {
@@ -1076,7 +1098,10 @@ Amiga::_pause()
     debug(RUN_DEBUG, "_pause\n");
 
     remoteManager.gdbServer.breakpointReached();
+
+    // Update the recorded debug information
     inspect();
+
     msgQueue.put(MSG_PAUSE);
 }
 
@@ -1123,8 +1148,8 @@ Amiga::_debugOff()
 isize
 Amiga::load(const u8 *buffer)
 {
-    auto result = AmigaComponent::load(buffer);
-    AmigaComponent::didLoad();
+    auto result = CoreComponent::load(buffer);
+    CoreComponent::didLoad();
     
     return result;
 }
@@ -1132,16 +1157,16 @@ Amiga::load(const u8 *buffer)
 isize
 Amiga::save(u8 *buffer)
 {
-    auto result = AmigaComponent::save(buffer);
-    AmigaComponent::didSave();
+    auto result = CoreComponent::save(buffer);
+    CoreComponent::didSave();
     
     return result;
 }
 
-Amiga::SyncMode
-Amiga::getSyncMode() const
+Amiga::ThreadMode
+Amiga::getThreadMode() const
 {
-    return config.vsync ? SyncMode::Pulsed : SyncMode::Periodic;
+    return config.syncMode == SYNC_VSYNC ? ThreadMode::Pulsed : ThreadMode::Periodic;
 }
 
 void
@@ -1243,12 +1268,12 @@ Amiga::execute()
             // Are we requested to enter or exit warp mode?
             if (flags & RL::WARP_ON) {
                 clearFlag(RL::WARP_ON);
-                AmigaComponent::warpOn();
+                CoreComponent::warpOn();
             }
 
             if (flags & RL::WARP_OFF) {
                 clearFlag(RL::WARP_OFF);
-                AmigaComponent::warpOff();
+                CoreComponent::warpOff();
             }
             
             // Are we requested to synchronize the thread?
@@ -1263,10 +1288,11 @@ Amiga::execute()
 double
 Amiga::refreshRate() const
 {
-    switch (getSyncMode()) {
+    switch (config.syncMode) {
 
-        case SyncMode::Pulsed:      return host.getHostRefreshRate();
-        case SyncMode::Periodic:    return config.type == PAL ? 50.0 : 60.0;
+        case SYNC_NATIVE_FPS:   return config.type == PAL ? 50.0 : 60.0;
+        case SYNC_FIXED_FPS:    return config.proposedFps;
+        case SYNC_VSYNC:        return host.getHostRefreshRate();
 
         default:
             fatalError;
diff --git a/Emulator/Amiga.h b/Emulator/Amiga.h
index 360278eb5..f18ca09eb 100644
--- a/Emulator/Amiga.h
+++ b/Emulator/Amiga.h
@@ -109,7 +109,7 @@ class Amiga : public Thread {
     
     // Other Peripherals
     Keyboard keyboard = Keyboard(*this);
-    
+
     // Shortcuts
     FloppyDrive *df[4] = { &df0, &df1, &df2, &df3 };
     HardDrive *hd[4] = { &hd0, &hd1, &hd2, &hd3 };
@@ -172,9 +172,12 @@ class Amiga : public Thread {
     Amiga();
     ~Amiga();
 
+    // Launches the emulator thread
+    void launch();
+
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 public:
@@ -188,7 +191,7 @@ class Amiga : public Thread {
 
     
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
     
 public:
@@ -217,7 +220,8 @@ class Amiga : public Thread {
         worker
 
         << config.type
-        << config.vsync;
+        << config.syncMode
+        << config.proposedFps;
     }
 
     template <class T>
@@ -245,7 +249,7 @@ class Amiga : public Thread {
     
 private:
     
-    SyncMode getSyncMode() const override;
+    ThreadMode getThreadMode() const override;
     void execute() override;
 
 public:
@@ -291,7 +295,7 @@ class Amiga : public Thread {
     
 public:
     
-    AmigaInfo getInfo() const { return AmigaComponent::getInfo(info); }
+    AmigaInfo getInfo() const { return CoreComponent::getInfo(info); }
     
     InspectionTarget getInspectionTarget() const;
     void setInspectionTarget(InspectionTarget target, Cycle trigger = 0);
diff --git a/Emulator/AmigaTypes.h b/Emulator/AmigaTypes.h
index 693d3c6e1..fa8f26f6c 100644
--- a/Emulator/AmigaTypes.h
+++ b/Emulator/AmigaTypes.h
@@ -43,6 +43,35 @@ struct VideoFormatEnum : util::Reflection<VideoFormatEnum, VideoFormat>
 };
 #endif
 
+enum_long(SYNC_MODE)
+{
+    SYNC_NATIVE_FPS,
+    SYNC_FIXED_FPS,
+    SYNC_VSYNC
+};
+typedef SYNC_MODE SyncMode;
+
+#ifdef __cplusplus
+struct SyncModeEnum : util::Reflection<SyncModeEnum, SyncMode>
+{
+    static constexpr long minVal = 0;
+    static constexpr long maxVal = SYNC_VSYNC;
+    static bool isValid(auto val) { return val >= minVal && val <= maxVal; }
+
+    static const char *prefix() { return "SYNC"; }
+    static const char *key(SyncMode value)
+    {
+        switch (value) {
+
+            case SYNC_NATIVE_FPS:   return "NATIVE_FPS";
+            case SYNC_FIXED_FPS:    return "FIXED_FPS";
+            case SYNC_VSYNC:        return "VSYNC";
+        }
+        return "???";
+    }
+};
+#endif
+
 enum_long(CONFIG_SCHEME)
 {
     CONFIG_A1000_OCS_1MB,
@@ -280,6 +309,7 @@ struct ChipsetRegEnum : util::Reflection<ChipsetRegEnum, ChipsetReg>
 };
 #endif
 
+
 //
 // Structures
 //
@@ -287,7 +317,8 @@ struct ChipsetRegEnum : util::Reflection<ChipsetRegEnum, ChipsetReg>
 typedef struct
 {
     VideoFormat type;
-    bool vsync;
+    SyncMode syncMode;
+    isize proposedFps;
 }
 AmigaConfig;
 
@@ -303,16 +334,6 @@ typedef struct
 }
 AmigaInfo;
 
-/*
-typedef struct
-{
-    double refreshRate;
-    isize frameBufferWidth;
-    isize frameBufferHeight;
-}
-HostInfo;
-*/
-
 
 //
 // Private data types
diff --git a/Emulator/Base/CMakeLists.txt b/Emulator/Base/CMakeLists.txt
index ba2ce3bf2..ef0fb00d1 100644
--- a/Emulator/Base/CMakeLists.txt
+++ b/Emulator/Base/CMakeLists.txt
@@ -1,8 +1,8 @@
 target_sources(vAmigaCore PRIVATE
 
 Error.cpp
-AmigaObject.cpp
-AmigaComponent.cpp
+CoreObject.cpp
+CoreComponent.cpp
 SubComponent.cpp
 Thread.cpp
 MsgQueue.cpp
diff --git a/Emulator/Base/AmigaComponent.cpp b/Emulator/Base/CoreComponent.cpp
similarity index 74%
rename from Emulator/Base/AmigaComponent.cpp
rename to Emulator/Base/CoreComponent.cpp
index c6c2a2e91..58643198f 100644
--- a/Emulator/Base/AmigaComponent.cpp
+++ b/Emulator/Base/CoreComponent.cpp
@@ -8,17 +8,17 @@
 // -----------------------------------------------------------------------------
 
 #include "config.h"
-#include "AmigaComponent.h"
+#include "CoreComponent.h"
 #include "Checksum.h"
 
 namespace vamiga {
 
 void
-AmigaComponent::initialize()
+CoreComponent::initialize()
 {
     try {
         
-        for (AmigaComponent *c : subComponents) { c->initialize(); }
+        for (CoreComponent *c : subComponents) { c->initialize(); }
         _initialize();
         
     } catch (std::exception &e) {
@@ -29,38 +29,38 @@ AmigaComponent::initialize()
 }
 
 void
-AmigaComponent::reset(bool hard)
+CoreComponent::reset(bool hard)
 {
-    for (AmigaComponent *c : subComponents) { c->reset(hard); }
+    for (CoreComponent *c : subComponents) { c->reset(hard); }
     _reset(hard);
 }
 
 void
-AmigaComponent::inspect() const
+CoreComponent::inspect() const
 {
-    for (AmigaComponent *c : subComponents) { c->inspect(); }
+    for (CoreComponent *c : subComponents) { c->inspect(); }
     _inspect();
 }
 
 isize
-AmigaComponent::size()
+CoreComponent::size()
 {
     isize result = _size();
     
     // Add 8 bytes for the checksum
     result += 8;
     
-    for (AmigaComponent *c : subComponents) { result += c->size(); }
+    for (CoreComponent *c : subComponents) { result += c->size(); }
     return result;
 }
 
 u64
-AmigaComponent::checksum()
+CoreComponent::checksum()
 {
     u64 result = _checksum();
     
     // Compute checksums for all subcomponents
-    for (AmigaComponent *c : subComponents) {
+    for (CoreComponent *c : subComponents) {
         result = util::fnvIt64(result, c->checksum());
     }
     
@@ -68,7 +68,7 @@ AmigaComponent::checksum()
 }
 
 isize
-AmigaComponent::load(const u8 *buffer)
+CoreComponent::load(const u8 *buffer)
 {
     assert(!isRunning());
     
@@ -78,7 +78,7 @@ AmigaComponent::load(const u8 *buffer)
     ptr += willLoadFromBuffer(ptr);
 
     // Load internal state of all subcomponents
-    for (AmigaComponent *c : subComponents) {
+    for (CoreComponent *c : subComponents) {
         ptr += c->load(ptr);
     }
 
@@ -102,11 +102,11 @@ AmigaComponent::load(const u8 *buffer)
 }
 
 void
-AmigaComponent::didLoad()
+CoreComponent::didLoad()
 {
     assert(!isRunning());
 
-    for (AmigaComponent *c : subComponents) {
+    for (CoreComponent *c : subComponents) {
         c->didLoad();
     }
 
@@ -114,7 +114,7 @@ AmigaComponent::didLoad()
 }
 
 isize
-AmigaComponent::save(u8 *buffer)
+CoreComponent::save(u8 *buffer)
 {
     u8 *ptr = buffer;
     
@@ -122,7 +122,7 @@ AmigaComponent::save(u8 *buffer)
     ptr += willSaveToBuffer(ptr);
     
     // Save internal state of all subcomponents
-    for (AmigaComponent *c : subComponents) {
+    for (CoreComponent *c : subComponents) {
         ptr += c->save(ptr);
     }
 
@@ -143,9 +143,9 @@ AmigaComponent::save(u8 *buffer)
 }
 
 void
-AmigaComponent::didSave()
+CoreComponent::didSave()
 {        
-    for (AmigaComponent *c : subComponents) {
+    for (CoreComponent *c : subComponents) {
         c->didSave();
     }
 
@@ -153,70 +153,70 @@ AmigaComponent::didSave()
 }
 
 void
-AmigaComponent::isReady() const
+CoreComponent::isReady() const
 {
     for (auto c : subComponents) { c->isReady(); }
     _isReady();
 }
 
 void
-AmigaComponent::powerOn()
+CoreComponent::powerOn()
 {
     for (auto c : subComponents) { c->powerOn(); }
     _powerOn();
 }
 
 void
-AmigaComponent::powerOff()
+CoreComponent::powerOff()
 {
     for (auto c : subComponents) { c->powerOff(); }
     _powerOff();
 }
 
 void
-AmigaComponent::run()
+CoreComponent::run()
 {
     for (auto c : subComponents) { c->run(); }
     _run();
 }
 
 void
-AmigaComponent::pause()
+CoreComponent::pause()
 {
     for (auto c : subComponents) { c->pause(); }
     _pause();
 }
 
 void
-AmigaComponent::halt()
+CoreComponent::halt()
 {
     for (auto c : subComponents) { c->halt(); }
     _halt();
 }
 
 void
-AmigaComponent::warpOn()
+CoreComponent::warpOn()
 {
     for (auto c : subComponents) { c->warpOn(); }
     _warpOn();
 }
 
 void
-AmigaComponent::warpOff()
+CoreComponent::warpOff()
 {
     for (auto c : subComponents) { c->warpOff(); }
     _warpOff();
 }
 
 void
-AmigaComponent::debugOn()
+CoreComponent::debugOn()
 {    
     for (auto c : subComponents) { c->debugOn(); }
     _debugOn();
 }
 
 void
-AmigaComponent::debugOff()
+CoreComponent::debugOff()
 {
     for (auto c : subComponents) { c->debugOff(); }
     _debugOff();
diff --git a/Emulator/Base/AmigaComponent.h b/Emulator/Base/CoreComponent.h
similarity index 97%
rename from Emulator/Base/AmigaComponent.h
rename to Emulator/Base/CoreComponent.h
index 720b247b8..1b404ce11 100644
--- a/Emulator/Base/AmigaComponent.h
+++ b/Emulator/Base/CoreComponent.h
@@ -9,8 +9,8 @@
 
 #pragma once
 
-#include "AmigaComponentTypes.h"
-#include "AmigaObject.h"
+#include "CoreComponentTypes.h"
+#include "CoreObject.h"
 #include "Serialization.h"
 #include "Concurrency.h"
 #include <vector>
@@ -42,7 +42,7 @@ struct NoAssign
     NoAssign& operator=(NoAssign const&) = delete;
 };
 
-class AmigaComponent : public AmigaObject, NoCopy, NoAssign {
+class CoreComponent : public CoreObject, NoCopy, NoAssign {
 
 protected:
     
@@ -50,7 +50,7 @@ class AmigaComponent : public AmigaObject, NoCopy, NoAssign {
     bool verbose = true;
 
     // Sub components
-    std::vector<AmigaComponent *> subComponents;
+    std::vector<CoreComponent *> subComponents;
 
     /* Mutex for implementing the 'synchronized' macro. The macro can be used
      * to prevent multiple threads to enter the same code block. It mimics the
diff --git a/Emulator/Base/AmigaComponentTypes.h b/Emulator/Base/CoreComponentTypes.h
similarity index 97%
rename from Emulator/Base/AmigaComponentTypes.h
rename to Emulator/Base/CoreComponentTypes.h
index 18ecf3a83..2a9e5f7ba 100644
--- a/Emulator/Base/AmigaComponentTypes.h
+++ b/Emulator/Base/CoreComponentTypes.h
@@ -20,7 +20,8 @@ enum_long(OPT)
 {
     // Amiga
     OPT_VIDEO_FORMAT,
-    OPT_VSYNC,
+    OPT_SYNC_MODE,
+    OPT_PROPOSED_FPS,
     
     // Agnus
     OPT_AGNUS_REVISION,
@@ -156,6 +157,8 @@ struct OptionEnum : util::Reflection<OptionEnum, Option>
         switch (value) {
 
             case OPT_VIDEO_FORMAT:          return "VIDEO_FORMAT";
+            case OPT_SYNC_MODE:             return "SYNC_MODE";
+            case OPT_PROPOSED_FPS:          return "PROPOSED_FPS";
 
             case OPT_AGNUS_REVISION:        return "AGNUS_REVISION";
             case OPT_SLOW_RAM_MIRROR:       return "SLOW_RAM_MIRROR";
diff --git a/Emulator/Base/AmigaObject.cpp b/Emulator/Base/CoreObject.cpp
similarity index 75%
rename from Emulator/Base/AmigaObject.cpp
rename to Emulator/Base/CoreObject.cpp
index a6d1e182b..6c6acdd21 100644
--- a/Emulator/Base/AmigaObject.cpp
+++ b/Emulator/Base/CoreObject.cpp
@@ -8,28 +8,28 @@
 // -----------------------------------------------------------------------------
 
 #include "config.h"
-#include "AmigaObject.h"
+#include "CoreObject.h"
 #include <iostream>
 
 namespace vamiga {
 
 bool
-AmigaObject::verbose = true;
+CoreObject::verbose = true;
 
 void
-AmigaObject::prefix() const
+CoreObject::prefix() const
 {
     fprintf(stderr, "%s: ", getDescription());
 }
 
 void
-AmigaObject::dump(Category category, std::ostream& ss) const
+CoreObject::dump(Category category, std::ostream& ss) const
 {
     _dump(category, ss);
 }
 
 void
-AmigaObject::dump(Category category) const
+CoreObject::dump(Category category) const
 {
     dump(category, std::cout);
 }
diff --git a/Emulator/Base/AmigaObject.h b/Emulator/Base/CoreObject.h
similarity index 90%
rename from Emulator/Base/AmigaObject.h
rename to Emulator/Base/CoreObject.h
index 531585c66..c987cfa3f 100644
--- a/Emulator/Base/AmigaObject.h
+++ b/Emulator/Base/CoreObject.h
@@ -16,11 +16,11 @@ namespace vamiga {
 /* Object model:
  *
  * ------------------
- * |  AmigaObject   |
+ * |   CoreObject   |
  * ------------------
  *         |
  * ------------------
- * | AmigaComponent |
+ * | CoreComponent  |
  * ------------------
  *         |
  *         |   ------------------   ----------------
@@ -30,18 +30,18 @@ namespace vamiga {
  *         |-->|  SubComponent  |
  *             ------------------
  *
- * AmigaObject is the base class for all Amiga related classes. It provides a
+ * CoreObject is the base class for all Amiga related classes. It provides a
  * a textual description for the object as well as various functions for
  * printing debug information.
  *
- * AmigaComponent defines the base functionality of all hardware components. It
+ * CoreComponent defines the base functionality of all hardware components. It
  * comprises functions for initializing, configuring, and serializing the
  * object, as well as functions for powering up and down, running and
  * pausing. Furthermore, a 'SYNCHRONIZED' macro is provided to prevent mutual
- * execution of certain code components.
+ * execution of particular code blocks.
  *
  * Thread adds the ability to run the component asynchroneously. It implements
- * the emulator's state model (off, paused, running).
+ * the emulator's state model (off, paused, running, suspended).
  */
 
 enum class Category
@@ -49,11 +49,11 @@ enum class Category
     BankMap, Beam, Blocks, Breakpoints, Bus, Callstack, Catchpoints, Checksums,
     Config, Current, Debug, Defaults, Disk, Dma, Drive, Events, FileSystem, Fpu,
     Geometry, Hunks, Inspection, List1, List2, Parameters, Partitions,
-    Properties, Registers, Sections, Segments, Signals, Stats, Status, SwTraps,
-    Tod, Vectors, Volumes, Watchpoints
+    Progress, Properties, Registers, Sections, Segments, Signals, Stats, Status,
+    SwTraps, Tod, Vectors, Volumes, Watchpoints
 };
 
-class AmigaObject {
+class CoreObject {
 
 protected:
     
@@ -65,7 +65,7 @@ class AmigaObject {
 
 public:
 
-    virtual ~AmigaObject() { };
+    virtual ~CoreObject() { };
     
     
     //
diff --git a/Emulator/Base/Defaults.cpp b/Emulator/Base/Defaults.cpp
index c086fb4ae..794dde44f 100644
--- a/Emulator/Base/Defaults.cpp
+++ b/Emulator/Base/Defaults.cpp
@@ -32,7 +32,8 @@ namespace vamiga {
 Defaults::Defaults()
 {
     setFallback(OPT_VIDEO_FORMAT, PAL);
-    setFallback(OPT_VSYNC, false);
+    setFallback(OPT_SYNC_MODE, SYNC_NATIVE_FPS);
+    setFallback(OPT_PROPOSED_FPS, 60);
     setFallback(OPT_AGNUS_REVISION, AGNUS_ECS_1MB);
     setFallback(OPT_SLOW_RAM_MIRROR, true);
     setFallback(OPT_PTR_DROPS, true);
diff --git a/Emulator/Base/Defaults.h b/Emulator/Base/Defaults.h
index 57757fe33..614435bfb 100644
--- a/Emulator/Base/Defaults.h
+++ b/Emulator/Base/Defaults.h
@@ -9,12 +9,12 @@
 
 #pragma once
 
-#include "AmigaComponent.h"
+#include "CoreComponent.h"
 #include "IOUtils.h"
 
 namespace vamiga {
 
-class Defaults : public AmigaObject {
+class Defaults : public CoreObject {
 
     mutable util::ReentrantMutex mutex;
     
@@ -37,7 +37,7 @@ class Defaults : public AmigaObject {
     
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
 
 private:
diff --git a/Emulator/Base/Host.cpp b/Emulator/Base/Host.cpp
index 734b538a8..58f571a6e 100644
--- a/Emulator/Base/Host.cpp
+++ b/Emulator/Base/Host.cpp
@@ -31,7 +31,8 @@ Host::_dump(Category category, std::ostream& os) const
         os << tab("Monitor refresh rate");
         os << flt(refreshRate) << " Hz" << std::endl;
         os << tab("Frame buffer size");
-        os << dec(frameBufferWidth) << " x " << dec(frameBufferHeight) << std::endl;
+        os << dec(frameBufferWidth) << " x ";
+        os << dec(frameBufferHeight) << " Texels" << std::endl;
     }
 }
 
@@ -50,7 +51,6 @@ Host::setHostRefreshRate(double fps)
         case 50: case 60: case 100: case 120: case 200: case 240:
 
             refreshRate = fps;
-            paula.muxer.adjustSpeed();
             break;
 
         default:
diff --git a/Emulator/Base/Host.h b/Emulator/Base/Host.h
index 4656aeb90..c18d6faeb 100644
--- a/Emulator/Base/Host.h
+++ b/Emulator/Base/Host.h
@@ -39,7 +39,7 @@ class Host : public SubComponent {
 
 
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
 
 private:
@@ -49,7 +49,7 @@ class Host : public SubComponent {
 
 
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
 
 private:
diff --git a/Emulator/Base/MsgQueue.h b/Emulator/Base/MsgQueue.h
index 7f49d1f6b..e67147c1f 100644
--- a/Emulator/Base/MsgQueue.h
+++ b/Emulator/Base/MsgQueue.h
@@ -35,7 +35,7 @@ class MsgQueue : public SubComponent {
     
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 private:
@@ -45,7 +45,7 @@ class MsgQueue : public SubComponent {
     
     
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
     
 private:
diff --git a/Emulator/Base/SubComponent.h b/Emulator/Base/SubComponent.h
index d65d717e1..405a07039 100644
--- a/Emulator/Base/SubComponent.h
+++ b/Emulator/Base/SubComponent.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "AmigaComponent.h"
+#include "CoreComponent.h"
 
 namespace vamiga {
 
@@ -48,10 +48,10 @@ class SerialPort;
 class UART;
 class ZorroManager;
 
-/* This class extends the AmigaComponent class with references to all components
+/* This class extends the CoreComponent class with references to all components
  * that are part of the Amiga class.
  */
-class SubComponent : public AmigaComponent {
+class SubComponent : public CoreComponent {
 
 protected:
 
diff --git a/Emulator/Base/Thread.cpp b/Emulator/Base/Thread.cpp
index fe0234152..b43ff2976 100644
--- a/Emulator/Base/Thread.cpp
+++ b/Emulator/Base/Thread.cpp
@@ -26,7 +26,7 @@ Thread::~Thread()
 }
 
 template <> void
-Thread::execute<Thread::SyncMode::Periodic>()
+Thread::execute<Thread::ThreadMode::Periodic>()
 {
     loadClock.go();
     execute();
@@ -34,7 +34,7 @@ Thread::execute<Thread::SyncMode::Periodic>()
 }
 
 template <> void
-Thread::execute<Thread::SyncMode::Pulsed>()
+Thread::execute<Thread::ThreadMode::Pulsed>()
 {
     loadClock.go();
     execute();
@@ -43,7 +43,7 @@ Thread::execute<Thread::SyncMode::Pulsed>()
 }
 
 template <> void
-Thread::sleep<Thread::SyncMode::Periodic>()
+Thread::sleep<Thread::ThreadMode::Periodic>()
 {
     auto now = util::Time::now();
 
@@ -82,7 +82,7 @@ Thread::sleep<Thread::SyncMode::Periodic>()
 }
 
 template <> void
-Thread::sleep<Thread::SyncMode::Pulsed>()
+Thread::sleep<Thread::ThreadMode::Pulsed>()
 {
     // Set a timeout to prevent the thread from stalling
     auto timeout = util::Time(i64(2000000000.0 / refreshRate()));
@@ -100,33 +100,33 @@ Thread::main()
 
         if (isRunning()) {
 
-            switch (getSyncMode()) {
+            switch (getThreadMode()) {
 
-                case SyncMode::Periodic: execute<SyncMode::Periodic>(); break;
-                case SyncMode::Pulsed: execute<SyncMode::Pulsed>(); break;
+                case ThreadMode::Periodic: execute<ThreadMode::Periodic>(); break;
+                case ThreadMode::Pulsed: execute<ThreadMode::Pulsed>(); break;
             }
         }
 
         if (!warpMode || !isRunning()) {
             
-            switch (getSyncMode()) {
+            switch (getThreadMode()) {
 
-                case SyncMode::Periodic: sleep<SyncMode::Periodic>(); break;
-                case SyncMode::Pulsed: sleep<SyncMode::Pulsed>(); break;
+                case ThreadMode::Periodic: sleep<ThreadMode::Periodic>(); break;
+                case ThreadMode::Pulsed: sleep<ThreadMode::Pulsed>(); break;
             }
         }
         
         // Are we requested to enter or exit warp mode?
         if (newWarpMode != warpMode) {
             
-            AmigaComponent::warpOnOff(newWarpMode);
+            CoreComponent::warpOnOff(newWarpMode);
             warpMode = newWarpMode;
         }
 
         // Are we requested to enter or exit warp mode?
         if (newDebugMode != debugMode) {
             
-            AmigaComponent::debugOnOff(newDebugMode);
+            CoreComponent::debugOnOff(newDebugMode);
             debugMode = newDebugMode;
         }
 
@@ -135,33 +135,33 @@ Thread::main()
             
             if (state == EXEC_OFF && newState == EXEC_PAUSED) {
                 
-                AmigaComponent::powerOn();
+                CoreComponent::powerOn();
                 state = EXEC_PAUSED;
 
             } else if (state == EXEC_OFF && newState == EXEC_RUNNING) {
 
-                AmigaComponent::powerOn();
+                CoreComponent::powerOn();
                 state = EXEC_PAUSED;
 
             } else if (state == EXEC_PAUSED && newState == EXEC_OFF) {
                 
-                AmigaComponent::powerOff();
+                CoreComponent::powerOff();
                 state = EXEC_OFF;
 
             } else if (state == EXEC_PAUSED && newState == EXEC_RUNNING) {
                 
-                AmigaComponent::run();
+                CoreComponent::run();
                 state = EXEC_RUNNING;
 
             } else if (state == EXEC_RUNNING && newState == EXEC_OFF) {
                 
                 state = EXEC_PAUSED;
-                AmigaComponent::pause();
+                CoreComponent::pause();
 
             } else if (state == EXEC_RUNNING && newState == EXEC_PAUSED) {
                 
                 state = EXEC_PAUSED;
-                AmigaComponent::pause();
+                CoreComponent::pause();
 
             } else if (state == EXEC_RUNNING && newState == EXEC_SUSPENDED) {
                 
@@ -173,7 +173,7 @@ Thread::main()
 
             } else if (newState == EXEC_HALTED) {
                 
-                AmigaComponent::halt();
+                CoreComponent::halt();
                 state = EXEC_HALTED;
                 return;
 
@@ -327,7 +327,7 @@ Thread::changeDebugTo(u8 value, bool blocking)
 void
 Thread::wakeUp()
 {
-    if (getSyncMode() == SyncMode::Pulsed) util::Wakeable::wakeUp();
+    if (getThreadMode() == ThreadMode::Pulsed) util::Wakeable::wakeUp();
 }
 
 void
diff --git a/Emulator/Base/Thread.h b/Emulator/Base/Thread.h
index 33984f737..2c9248cf8 100644
--- a/Emulator/Base/Thread.h
+++ b/Emulator/Base/Thread.h
@@ -10,7 +10,7 @@
 #pragma once
 
 #include "ThreadTypes.h"
-#include "AmigaComponent.h"
+#include "CoreComponent.h"
 #include "Chrono.h"
 #include "Concurrency.h"
 
@@ -118,7 +118,7 @@ namespace vamiga {
  * the recorded information in a trace buffer.
  */
 
-class Thread : public AmigaComponent, util::Wakeable {
+class Thread : public CoreComponent, util::Wakeable {
     
 protected:
     
@@ -128,7 +128,7 @@ class Thread : public AmigaComponent, util::Wakeable {
     std::thread thread;
 
     // The current synchronization mode
-    enum class SyncMode { Periodic, Pulsed };
+    enum class ThreadMode { Periodic, Pulsed };
     
     // The current thread state and a change request
     volatile ExecutionState state = EXEC_OFF;
@@ -175,8 +175,8 @@ class Thread : public AmigaComponent, util::Wakeable {
 
 private:
     
-    template <SyncMode M> void execute();
-    template <SyncMode M> void sleep();
+    template <ThreadMode M> void execute();
+    template <ThreadMode M> void sleep();
 
     // The main entry point (called when the thread is created)
     void main();
@@ -244,7 +244,7 @@ class Thread : public AmigaComponent, util::Wakeable {
 public:
 
     // Provides the current sync mode
-    virtual SyncMode getSyncMode() const = 0;
+    virtual ThreadMode getThreadMode() const = 0;
 
     // Awakes the thread if it runs in pulse mode
     void wakeUp();
@@ -257,8 +257,8 @@ class Thread : public AmigaComponent, util::Wakeable {
 
 struct AutoResume {
 
-    AmigaComponent *c;
-    AutoResume(AmigaComponent *c) : c(c) { c->suspend(); }
+    CoreComponent *c;
+    AutoResume(CoreComponent *c) : c(c) { c->suspend(); }
     ~AutoResume() { c->resume(); }
 };
 
diff --git a/Emulator/CIA/CIA.cpp b/Emulator/CIA/CIA.cpp
index 143edc44d..4a13b12c7 100755
--- a/Emulator/CIA/CIA.cpp
+++ b/Emulator/CIA/CIA.cpp
@@ -23,13 +23,13 @@ namespace vamiga {
 
 CIA::CIA(int n, Amiga& ref) : SubComponent(ref), nr(n)
 {    
-    subComponents = std::vector<AmigaComponent *> { &tod };
+    subComponents = std::vector<CoreComponent *> { &tod };
 }
 
 void
 CIA::_initialize()
 {
-    AmigaComponent::_initialize();
+    CoreComponent::_initialize();
 
     pa = 0xFF;
     pb = 0xFF;
diff --git a/Emulator/CIA/CIA.h b/Emulator/CIA/CIA.h
index c1bf76a56..8d3db1323 100755
--- a/Emulator/CIA/CIA.h
+++ b/Emulator/CIA/CIA.h
@@ -270,7 +270,7 @@ class CIA : public SubComponent {
 
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 private:
@@ -279,7 +279,7 @@ class CIA : public SubComponent {
     
     
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
 
     void _initialize() override;
@@ -364,7 +364,7 @@ class CIA : public SubComponent {
     
 public:
     
-    CIAInfo getInfo() const { return AmigaComponent::getInfo(info); }
+    CIAInfo getInfo() const { return CoreComponent::getInfo(info); }
     Cycle getClock() const { return clock; }
     
 protected:
diff --git a/Emulator/CIA/TOD.h b/Emulator/CIA/TOD.h
index 6c9fe8a58..26dd3c8cc 100755
--- a/Emulator/CIA/TOD.h
+++ b/Emulator/CIA/TOD.h
@@ -80,7 +80,7 @@ class TOD : public SubComponent {
 
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 private:
@@ -90,7 +90,7 @@ class TOD : public SubComponent {
 
     
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
     
 private:
@@ -130,7 +130,7 @@ class TOD : public SubComponent {
     
 public:
     
-    TODInfo getInfo() const { return AmigaComponent::getInfo(info); }
+    TODInfo getInfo() const { return CoreComponent::getInfo(info); }
 
     void _inspect() const override;
 
diff --git a/Emulator/CMakeLists.txt b/Emulator/CMakeLists.txt
index 7cbd01e9e..38cf8509e 100644
--- a/Emulator/CMakeLists.txt
+++ b/Emulator/CMakeLists.txt
@@ -3,6 +3,9 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
 # Set the project name
 project(vAmigaCore)
 
+# Enable testing
+enable_testing()
+
 # Specify the C++ standard
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
@@ -13,7 +16,7 @@ if(NOT CMAKE_BUILD_TYPE)
 #  set(CMAKE_BUILD_TYPE Release)
 endif()
 
-# Add emulator library
+# Add the emulator library
 add_library(vAmigaCore Amiga.cpp)
 
 # Add the console app (vAmiga Headless)
@@ -105,3 +108,6 @@ add_subdirectory(CPU/Moira/softfloat)
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)
 target_link_libraries(vAmigaCore xdms softfloat Threads::Threads)
+
+# Add tests
+add_test(NAME SelfTest COMMAND vAmigaConsole --selftest)
diff --git a/Emulator/CPU/CPU.cpp b/Emulator/CPU/CPU.cpp
index a5f34f58b..574bc1361 100644
--- a/Emulator/CPU/CPU.cpp
+++ b/Emulator/CPU/CPU.cpp
@@ -442,6 +442,22 @@ CPU::_inspect() const
 void
 CPU::_dump(Category category, std::ostream& os) const
 {
+    auto print = [&](const string &name, const moira::Guards &guards) {
+
+        for (int i = 0; i < guards.elements(); i++) {
+
+            auto bp =  guards.guardNr(i);
+            auto nr = name + std::to_string(i);
+
+            os << util::tab(nr);
+            os << util::hex(bp->addr);
+
+            if (!bp->enabled) os << " (Disabled)";
+            else if (bp->ignore) os << " (Disabled for " << util::dec(bp->ignore) << " hits)";
+            os << std::endl;
+        }
+    };
+
     if (category == Category::Config) {
 
         os << util::tab("CPU revision");
@@ -552,22 +568,8 @@ CPU::_dump(Category category, std::ostream& os) const
     if (category == Category::Breakpoints) {
 
         if (debugger.breakpoints.elements()) {
-
-            for (int i = 0; i < debugger.breakpoints.elements(); i++) {
-
-                auto bp = debugger.breakpoints.guardNr(i);
-                auto nr = "Breakpoint " + std::to_string(i);
-
-                os << util::tab(nr);
-                os << util::hex(bp->addr);
-
-                if (!bp->enabled) os << " (Disabled)";
-                else if (bp->ignore) os << " (Disabled for " << bp->ignore << " hits)";
-                os << std::endl;
-            }
-
+            print("Breakpoint", debugger.breakpoints);
         } else {
-
             os << "No breakpoints set" << std::endl;
         }
     }
@@ -575,21 +577,8 @@ CPU::_dump(Category category, std::ostream& os) const
     if (category == Category::Watchpoints) {
 
         if (debugger.watchpoints.elements()) {
-
-            for (int i = 0; i < debugger.watchpoints.elements(); i++) {
-
-                auto wp = debugger.watchpoints.guardNr(i);
-                auto nr = "Watchpoint " + std::to_string(i);
-
-                os << util::tab(nr);
-                os << util::hex(wp->addr);
-                if (!wp->enabled) os << " (Disabled)";
-                else if (wp->ignore) os << " (Disabled for " << wp->ignore << " hits)";
-                os << std::endl;
-            }
-
+            print("Watchpoint", debugger.watchpoints);
         } else {
-
             os << "No watchpoints set" << std::endl;
         }
     }
@@ -705,7 +694,7 @@ CPU::disassembleRecordedFlags(isize i)
 {
     static char result[18];
     
-    disassembleSR(debugger.logEntryAbs((int)i).sr, result);
+    disassembleSR(result, debugger.logEntryAbs((int)i).sr);
     return result;
 }
 
@@ -713,37 +702,46 @@ const char *
 CPU::disassembleRecordedPC(isize i)
 {
     static char result[16];
-    
-    Moira::disassemblePC(debugger.logEntryAbs((int)i).pc0, result);
+
+    Moira::dump24(result, debugger.logEntryAbs((int)i).pc0);
     return result;
 }
 
 const char *
-CPU::disassembleInstr(u32 addr, isize *len)
+CPU::disassembleAddr(u32 addr)
 {
-    static char result[128];
+    static char result[16];
 
-    int l = disassemble(addr, result);
+    Moira::dump24(result, addr);
+    return result;
+}
 
-    if (len) *len = (isize)l;
+const char *
+CPU::disassembleWord(u16 value)
+{
+    static char result[16];
+
+    Moira::dump16(result, value);
     return result;
 }
 
 const char *
-CPU::disassembleWords(u32 addr, isize len)
+CPU::disassembleInstr(u32 addr, isize *len)
 {
-    static char result[64];
+    static char result[128];
 
-    disassembleMemory(addr, (int)len, result);
+    int l = disassemble(result, addr);
+
+    if (len) *len = (isize)l;
     return result;
 }
 
 const char *
-CPU::disassembleAddr(u32 addr)
+CPU::disassembleWords(u32 addr, isize len)
 {
-    static char result[16];
+    static char result[64];
 
-    disassemblePC(addr, result);
+    dump16(result, addr, len);
     return result;
 }
 
@@ -759,6 +757,12 @@ CPU::disassembleWords(isize len)
     return disassembleWords(reg.pc0, len);
 }
 
+const char *
+CPU::disassemblePC()
+{
+    return disassembleAddr(reg.pc0);
+}
+
 void
 CPU::dumpLogBuffer(std::ostream& os, isize count)
 {
@@ -785,6 +789,12 @@ CPU::dumpLogBuffer(std::ostream& os, isize count)
     }
 }
 
+void
+CPU::dumpLogBuffer(std::ostream& os)
+{
+    dumpLogBuffer(os, debugger.loggedInstructions());
+}
+
 void
 CPU::disassembleRange(std::ostream& os, u32 addr, isize count)
 {
diff --git a/Emulator/CPU/CPU.h b/Emulator/CPU/CPU.h
index 987dc9ab3..f29c1d6eb 100644
--- a/Emulator/CPU/CPU.h
+++ b/Emulator/CPU/CPU.h
@@ -50,7 +50,7 @@ class CPU : public moira::Moira {
 
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 private:
@@ -60,7 +60,7 @@ class CPU : public moira::Moira {
 
     
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
     
 private:
@@ -158,7 +158,7 @@ class CPU : public moira::Moira {
     
 public:
     
-    CPUInfo getInfo() const { return AmigaComponent::getInfo(info); }
+    CPUInfo getInfo() const { return CoreComponent::getInfo(info); }
 
 
     //
@@ -191,16 +191,19 @@ class CPU : public moira::Moira {
     const char *disassembleRecordedPC(isize i);
 
     // Disassembles the instruction at the specified address
+    const char *disassembleWord(u16 value);
+    const char *disassembleAddr(u32 addr);
     const char *disassembleInstr(u32 addr, isize *len);
     const char *disassembleWords(u32 addr, isize len);
-    const char *disassembleAddr(u32 addr);
 
     // Disassembles the currently executed instruction
     const char *disassembleInstr(isize *len);
     const char *disassembleWords(isize len);
+    const char *disassemblePC();
 
-    // Dumps entries from the log buffer
+    // Dumps a portion of the log buffer
     void dumpLogBuffer(std::ostream& os, isize count);
+    void dumpLogBuffer(std::ostream& os);
 
     // Disassembles a memory range
     void disassembleRange(std::ostream& os, u32 addr, isize count);
diff --git a/Emulator/CPU/Moira/Moira.cpp b/Emulator/CPU/Moira/Moira.cpp
index 514858ef6..b376ad853 100644
--- a/Emulator/CPU/Moira/Moira.cpp
+++ b/Emulator/CPU/Moira/Moira.cpp
@@ -33,6 +33,22 @@ Moira::Moira(Amiga &ref) : SubComponent(ref)
     if (ENABLE_DASM) dasm = new DasmPtr[65536];
 
     createJumpTable(cpuModel, dasmModel);
+
+    instrStyle = DasmStyle {
+
+        .syntax         = DASM_MOIRA,
+        .letterCase     = DASM_MIXED_CASE,
+        .numberFormat   = { .prefix = "$", .radix = 16, .upperCase = false, .plainZero = false },
+        .tab            = 8
+    };
+
+    dataStyle = DasmStyle {
+
+        .syntax         = DASM_MOIRA,
+        .letterCase     = DASM_MIXED_CASE,
+        .numberFormat   = { .prefix = "", .radix = 16, .upperCase = false, .plainZero = false },
+        .tab            = 1
+    };
 }
 
 Moira::~Moira()
@@ -59,32 +75,29 @@ Moira::setModel(Model cpuModel, Model dasmModel)
 void
 Moira::setDasmSyntax(DasmSyntax value)
 {
-    style.syntax = value;
-}
-
-void
-Moira::setDasmNumberFormat(DasmNumberFormat value)
-{
-    if (value.prefix == nullptr) {
-        throw std::runtime_error("prefix must not be NULL");
-    }
-    if (value.radix != 10 && value.radix != 16) {
-        throw std::runtime_error("Invalid radix: " + std::to_string(value.radix));
-    }
-
-    style.numberFormat = value;
+    instrStyle.syntax = value;
 }
 
 void
 Moira::setDasmLetterCase(DasmLetterCase value)
 {
-    style.letterCase = value;
+    instrStyle.letterCase = value;
 }
 
 void
-Moira::setDasmIndentation(int value)
+Moira::setNumberFormat(DasmStyle &style, const DasmNumberFormat &value)
 {
-    style.tab = value;
+    auto validPrefix = [&](DasmNumberFormat fmt) { return fmt.prefix != nullptr; };
+    auto validRadix = [&](DasmNumberFormat fmt) { return fmt.radix == 10 || fmt.radix == 16; };
+
+    if (!validPrefix(value)) {
+        throw std::runtime_error("prefix must not be NULL");
+    }
+    if (!validRadix(value)) {
+        throw std::runtime_error("radix must be 10 or 16");
+    }
+
+    style.numberFormat = value;
 }
 
 bool
@@ -344,22 +357,29 @@ Moira::processException(const std::exception &exc)
 template <Core C> void
 Moira::processException(const std::exception &exc)
 {
-    auto ae = dynamic_cast<const AddressError *>(&exc);
-    if (ae) {
+    try {
 
-        execAddressError<C>(ae->stackFrame);
-        return;
-    }
+        auto ae = dynamic_cast<const AddressError *>(&exc);
+        if (ae) {
 
-    auto be = dynamic_cast<const BusErrorException *>(&exc);
-    if (be) {
+            execAddressError<C>(ae->stackFrame);
+            return;
+        }
 
-        execException(EXC_BUS_ERROR);
-        return;
-    }
+        auto be = dynamic_cast<const BusErrorException *>(&exc);
+        if (be) {
+
+            execException(EXC_BUS_ERROR);
+            return;
+        }
+
+        auto df = dynamic_cast<const DoubleFault *>(&exc);
+        if (df) {
+
+            throw df;
+        }
 
-    auto df = dynamic_cast<const DoubleFault *>(&exc);
-    if (df) {
+    } catch (DoubleFault & df) {
 
         halt();
         return;
diff --git a/Emulator/CPU/Moira/Moira.h b/Emulator/CPU/Moira/Moira.h
index 241dfbcc1..f38ff594d 100644
--- a/Emulator/CPU/Moira/Moira.h
+++ b/Emulator/CPU/Moira/Moira.h
@@ -34,14 +34,11 @@ class Moira : public SubComponent {
     // Instruction set used by the disassembler
     Model dasmModel = M68000;
 
-    // Disassembler styleh
-    DasmStyle style = {
+    // Visual style for disassembled instructions
+    DasmStyle instrStyle;
 
-        .syntax         = DASM_MOIRA,
-        .letterCase     = DASM_MIXED_CASE,
-        .numberFormat   = { .prefix = "$", .radix = 16 },
-        .tab            = 8
-    };
+    // Visual style for data dumps
+    DasmStyle dataStyle;
 
 
     //
@@ -153,11 +150,19 @@ class Moira : public SubComponent {
     void setModel(Model cpuModel, Model dasmModel);
     void setModel(Model model) { setModel(model, model); }
 
-    // Configures the disassembler
+    // Configures the visual appearance of disassembled instructions
     void setDasmSyntax(DasmSyntax value);
-    void setDasmNumberFormat(DasmNumberFormat value);
+    void setDasmNumberFormat(DasmNumberFormat value) { setNumberFormat(instrStyle, value); }
     void setDasmLetterCase(DasmLetterCase value);
-    void setDasmIndentation(int value);
+    void setDasmIndentation(int value) { instrStyle.tab = value; }
+
+    // Configures the visual appearance of data dumps
+    void setDumpNumberFormat(DasmNumberFormat value) { setNumberFormat(instrStyle, value); }
+    void setDumpIndentation(int value) { dataStyle.tab = value; }
+
+private:
+
+    void setNumberFormat(DasmStyle &style, const DasmNumberFormat &value);
 
 
     //
@@ -225,21 +230,21 @@ class Moira : public SubComponent {
 public:
 
     // Disassembles a single instruction and returns the instruction size
-    int disassemble(u32 addr, char *str) const;
-
-    // Returns a textual representation for a single word
-    void disassembleWord(u32 value, char *str) const;
+    int disassemble(char *str, u32 addr) const;
 
-    // Returns a textual representation for one or more words from memory
-    void disassembleMemory(u32 addr, int cnt, char *str) const;
+    // Creates a textual representation for the status register
+    void disassembleSR(char *str) const { disassembleSR(str, reg.sr); }
+    void disassembleSR(char *str, const StatusRegister &sr) const;
 
-    // Returns a textual representation for the program counter
-    void disassemblePC(char *str) const { disassemblePC(reg.pc, str); }
-    void disassemblePC(u32 pc, char *str) const;
+    // Creates a textual representation for a single data value
+    void dump8(char *str, u8 value) const;
+    void dump16(char *str, u16 value) const;
+    void dump24(char *str, u32 value) const;
+    void dump32(char *str, u32 value) const;
 
-    // Returns a textual representation for the status register
-    void disassembleSR(char *str) const { disassembleSR(reg.sr, str); }
-    void disassembleSR(const StatusRegister &sr, char *str) const;
+    // Creates a textual representation for multiple data values
+    void dump16(char *str, u16 values[], isize cnt) const;
+    void dump16(char *str, u32 addr, isize cnt) const;
 
     // Return an info struct for a certain opcode
     InstrInfo getInfo(u16 op) const;
diff --git a/Emulator/CPU/Moira/MoiraDasm.h b/Emulator/CPU/Moira/MoiraDasm.h
index 8e274e646..9fb79412f 100644
--- a/Emulator/CPU/Moira/MoiraDasm.h
+++ b/Emulator/CPU/Moira/MoiraDasm.h
@@ -9,8 +9,11 @@
 // Auxiliary functions
 //
 
-// Reads a word from memory and increments addr
-template <Size S = Word> u32 dasmRead(u32 &addr) const;
+// Reads a data value from memory without side-effects
+template <Size S = Word> u32 dasmRead(u32 addr) const;
+
+// Increments addr and reads a data value from memory without side-effects
+template <Size S = Word> u32 dasmIncRead(u32 &addr) const;
 
 // Assembles an operand
 template <Mode M, Size S = Word> Ea<M, S>Op(u16 reg, u32 &pc) const;
diff --git a/Emulator/CPU/Moira/MoiraDasmFPU_cpp.h b/Emulator/CPU/Moira/MoiraDasmFPU_cpp.h
index aa4aeff78..1b262000b 100644
--- a/Emulator/CPU/Moira/MoiraDasmFPU_cpp.h
+++ b/Emulator/CPU/Moira/MoiraDasmFPU_cpp.h
@@ -12,7 +12,7 @@
 template <Instr I, Mode M, Size S> void
 Moira::dasmFGen(StrWriter &str, u32 &addr, u16 op) const
 {
-    auto ext  = dasmRead<Word>(addr);
+    auto ext  = dasmIncRead<Word>(addr);
     auto cod  = xxx_____________(ext);
     auto cmd  = _________xxxxxxx(ext);
     addr -= 2;
@@ -128,7 +128,7 @@ template <Instr I, Mode M, Size S> void
 Moira::dasmFBcc(StrWriter &str, u32 &addr, u16 op) const
 {
     auto old = addr;
-    auto ext = dasmRead<S>(addr);
+    auto ext = dasmIncRead<S>(addr);
     auto cnd = ___________xxxxx (op);
 
     // Check for special FNOP opcode
@@ -152,7 +152,7 @@ template <Instr I, Mode M, Size S> void
 Moira::dasmFDbcc(StrWriter &str, u32 &addr, u16 op) const
 {
     auto old = addr;
-    auto ext = dasmRead(addr);
+    auto ext = dasmIncRead(addr);
     auto src = _____________xxx (op);
     auto cnd = ___________xxxxx (ext);
 
@@ -165,7 +165,7 @@ Moira::dasmFDbcc(StrWriter &str, u32 &addr, u16 op) const
     }
 
     auto dst = addr + 2;
-    U32_INC(dst, SEXT<S>(dasmRead<S>(addr)));
+    U32_INC(dst, SEXT<S>(dasmIncRead<S>(addr)));
 
     str << Ins<I>{} << Fcc{cnd} << str.tab << Dn{src} << Sep{} << UInt(dst);
 }
@@ -197,7 +197,7 @@ template <Instr I, Mode M, Size S> void
 Moira::dasmFScc(StrWriter &str, u32 &addr, u16 op) const
 {
     auto old = addr;
-    auto ext = dasmRead(addr);
+    auto ext = dasmIncRead(addr);
     auto reg = _____________xxx (op);
     auto cnd = __________xxxxxx (ext);
 
@@ -216,7 +216,7 @@ template <Instr I, Mode M, Size S> void
 Moira::dasmFTrapcc(StrWriter &str, u32 &addr, u16 op) const
 {
     auto old = addr;
-    auto ext = dasmRead(addr);
+    auto ext = dasmIncRead(addr);
     auto cnd = __________xxxxxx (ext);
 
     // Catch illegal extension words
@@ -237,7 +237,7 @@ Moira::dasmFTrapcc(StrWriter &str, u32 &addr, u16 op) const
         case Word:
         case Long:
 
-            str << Ins<I>{} << Fcc{cnd} << Sz<S>{} << str.tab << Ims<S>(dasmRead<S>(addr));
+            str << Ins<I>{} << Fcc{cnd} << Sz<S>{} << str.tab << Ims<S>(dasmIncRead<S>(addr));
             break;
     }
 }
@@ -245,7 +245,7 @@ Moira::dasmFTrapcc(StrWriter &str, u32 &addr, u16 op) const
 template <Instr I, Mode M, Size S> void
 Moira::dasmFGeneric(StrWriter &str, u32 &addr, u16 op) const
 {
-    auto ext = dasmRead(addr);
+    auto ext = dasmIncRead(addr);
     auto reg = _____________xxx (op);
     auto src = ___xxx__________ (ext);
     auto dst = ______xxx_______ (ext);
@@ -260,34 +260,34 @@ Moira::dasmFGeneric(StrWriter &str, u32 &addr, u16 op) const
 
                 case 0: // Long-Word Integer
 
-                    val = dasmRead<Long>(addr);
+                    val = dasmIncRead<Long>(addr);
                     str << Ins<I>{} << Ffmt{src} << str.tab << Ims<Long>(u32(val));
                     break;
 
                 case 1: // Single precision
 
-                    val = dasmRead<Long>(addr);
+                    val = dasmIncRead<Long>(addr);
                     str << Ins<I>{} << Ffmt{src} << str.tab << "#<fixme>";
                     break;
 
                 case 2: // Double precision
                 case 3: // Packed-Decimal Real
 
-                    val = dasmRead<Long>(addr);
-                    dasmRead<Long>(addr);
-                    dasmRead<Long>(addr); // Why???
+                    val = dasmIncRead<Long>(addr);
+                    dasmIncRead<Long>(addr);
+                    dasmIncRead<Long>(addr); // Why???
                     str << Ins<I>{} << Ffmt{src} << str.tab << "#<fixme>";
                     break;
 
                 case 5: // Double-precision real
 
-                    val = dasmRead<Long>(addr);
-                    dasmRead<Long>(addr);
+                    val = dasmIncRead<Long>(addr);
+                    dasmIncRead<Long>(addr);
                     str << Ins<I>{} << Ffmt{src} << str.tab << "#<fixme>";
                     break;
 
                 case 6: // Byte Integer
-                    val = dasmRead<Word>(addr);
+                    val = dasmIncRead<Word>(addr);
                     str << Ins<I>{} << Ffmt{src} << str.tab << Ims<Byte>(u32(val));
                     break;
 
@@ -308,7 +308,7 @@ Moira::dasmFGeneric(StrWriter &str, u32 &addr, u16 op) const
 template <Instr I, Mode M, Size S> void
 Moira::dasmFGeneric2(StrWriter &str, u32 &addr, u16 op) const
 {
-    auto ext = dasmRead(addr);
+    auto ext = dasmIncRead(addr);
     auto reg = _____________xxx (op);
     auto src = ___xxx__________ (ext);
     auto dst = ______xxx_______ (ext);
@@ -326,35 +326,35 @@ Moira::dasmFGeneric2(StrWriter &str, u32 &addr, u16 op) const
 
                 case 0: // Long-Word Integer
 
-                    val = dasmRead<Long>(addr);
+                    val = dasmIncRead<Long>(addr);
                     str << Ims<Long>(u32(val));
                     break;
 
                 case 1: // Single precision
 
-                    val = dasmRead<Long>(addr);
+                    val = dasmIncRead<Long>(addr);
                     str << "#<fixme>";
                     break;
 
                 case 2: // Double precision
                 case 3: // Packed-Decimal Real
 
-                    val = dasmRead<Long>(addr);
-                    dasmRead<Long>(addr);
-                    dasmRead<Long>(addr); // Why???
+                    val = dasmIncRead<Long>(addr);
+                    dasmIncRead<Long>(addr);
+                    dasmIncRead<Long>(addr); // Why???
                     str << "#<fixme>";
                     break;
 
                 case 5: // Double-precision real
 
-                    val = dasmRead<Long>(addr);
-                    dasmRead<Long>(addr);
+                    val = dasmIncRead<Long>(addr);
+                    dasmIncRead<Long>(addr);
                     str << "#<fixme>";
                     break;
 
                 case 6: // Byte Integer
 
-                    val = dasmRead<Word>(addr);
+                    val = dasmIncRead<Word>(addr);
                     str << Ims<Byte>(u32(val));
                     break;
 
@@ -375,7 +375,7 @@ Moira::dasmFGeneric2(StrWriter &str, u32 &addr, u16 op) const
 template <Instr I, Mode M, Size S> void
 Moira::dasmFGeneric3(StrWriter &str, u32 &addr, u16 op) const
 {
-    auto ext = dasmRead(addr);
+    auto ext = dasmIncRead(addr);
     auto reg = _____________xxx (op);
     auto src = ___xxx__________ (ext);
 
@@ -389,35 +389,35 @@ Moira::dasmFGeneric3(StrWriter &str, u32 &addr, u16 op) const
 
                 case 0: // Long-Word Integer
 
-                    val = dasmRead<Long>(addr);
+                    val = dasmIncRead<Long>(addr);
                     str << Ins<I>{} << Ffmt{src} << str.tab << Ims<Long>(u32(val));
                     break;
 
                 case 1: // Single precision
 
-                    val = dasmRead<Long>(addr);
+                    val = dasmIncRead<Long>(addr);
                     str << Ins<I>{} << Ffmt{src} << str.tab << "#<fixme>";
                     break;
 
                 case 2: // Double precision
                 case 3: // Packed-Decimal Real
 
-                    val = dasmRead<Long>(addr);
-                    dasmRead<Long>(addr);
-                    dasmRead<Long>(addr); // Why???
+                    val = dasmIncRead<Long>(addr);
+                    dasmIncRead<Long>(addr);
+                    dasmIncRead<Long>(addr); // Why???
                     str << Ins<I>{} << Ffmt{src} << str.tab << "#<fixme>";
                     break;
 
                 case 5: // Double-precision real
 
-                    val = dasmRead<Long>(addr);
-                    dasmRead<Long>(addr);
+                    val = dasmIncRead<Long>(addr);
+                    dasmIncRead<Long>(addr);
                     str << Ins<I>{} << Ffmt{src} << str.tab << "#<fixme>";
                     break;
 
                 case 6: // Byte Integer
 
-                    val = dasmRead<Word>(addr);
+                    val = dasmIncRead<Word>(addr);
                     str << Ins<I>{} << Ffmt{src} << str.tab << Ims<Byte>(u32(val));
                     break;
 
@@ -437,7 +437,7 @@ template <Instr I, Mode M, Size S> void
 Moira::dasmFMove(StrWriter &str, u32 &addr, u16 op) const
 {
     auto old = addr;
-    auto ext = dasmRead(addr);
+    auto ext = dasmIncRead(addr);
     auto reg = _____________xxx (op);
     auto cod = xxx_____________ (ext);
     auto src = ___xxx__________ (ext);
@@ -479,34 +479,34 @@ Moira::dasmFMove(StrWriter &str, u32 &addr, u16 op) const
                 switch (src) {
 
                     case 0: // Long-Word Integer
-                        val = dasmRead<Long>(addr);
+                        val = dasmIncRead<Long>(addr);
                         str << str.tab << Ims<Long>(u32(val)) << Sep{} << Fp(dst);
                         break;
 
                     case 1: // Single precision
 
-                        val = dasmRead<Long>(addr);
+                        val = dasmIncRead<Long>(addr);
                         str << str.tab << "#<fixme>" << Sep{} << Fp(dst);
                         break;
 
                     case 2: // Double precision
                     case 3: // Packed-Decimal Real
 
-                        val = dasmRead<Long>(addr);
-                        dasmRead<Long>(addr);
-                        dasmRead<Long>(addr); // Why???
+                        val = dasmIncRead<Long>(addr);
+                        dasmIncRead<Long>(addr);
+                        dasmIncRead<Long>(addr); // Why???
                         str << str.tab << "#<fixme>" << Sep{} << Fp(dst);
                         break;
 
                     case 5: // Double-precision real
 
-                        val = dasmRead<Long>(addr);
-                        dasmRead<Long>(addr);
+                        val = dasmIncRead<Long>(addr);
+                        dasmIncRead<Long>(addr);
                         str << str.tab << "#<fixme>" << Sep{} << Fp(dst);
                         break;
 
                     case 6: // Byte Integer
-                        val = dasmRead<Word>(addr);
+                        val = dasmIncRead<Word>(addr);
                         str << str.tab << Ims<Byte>(u32(val)) << Sep{} << Fp(dst);
                         break;
 
@@ -547,7 +547,7 @@ template <Instr I, Mode M, Size S> void
 Moira::dasmFMovecr(StrWriter &str, u32 &addr, u16 op) const
 {
     auto old = addr;
-    auto ext = dasmRead(addr);
+    auto ext = dasmIncRead(addr);
     auto dst = ______xxx_______ (ext);
     auto ofs = _________xxxxxxx (ext);
 
@@ -569,7 +569,7 @@ template <Instr I, Mode M, Size S> void
 Moira::dasmFMovem(StrWriter &str, u32 &addr, u16 op) const
 {
     auto old = addr;
-    auto ext = dasmRead(addr);
+    auto ext = dasmIncRead(addr);
     auto reg = _____________xxx (op);
     auto cod = xxx_____________ (ext);
     auto mod = ___xx___________ (ext);
diff --git a/Emulator/CPU/Moira/MoiraDasmMMU_cpp.h b/Emulator/CPU/Moira/MoiraDasmMMU_cpp.h
index a26533b6f..c1e2f31d7 100644
--- a/Emulator/CPU/Moira/MoiraDasmMMU_cpp.h
+++ b/Emulator/CPU/Moira/MoiraDasmMMU_cpp.h
@@ -10,7 +10,7 @@
 template <Instr I, Mode M, Size S> void
 Moira::dasmPGen(StrWriter &str, u32 &addr, u16 op) const
 {
-    auto ext = dasmRead<Word>(addr);
+    auto ext = dasmIncRead<Word>(addr);
     addr -= 2;
 
     // PLOAD: 0010 00x0 000x xxxx
@@ -55,7 +55,7 @@ template <Instr I, Mode M, Size S> void
 Moira::dasmPFlush(StrWriter &str, u32 &addr, u16 op) const
 {
     auto old  = addr;
-    auto ext  = dasmRead<Word>(addr);
+    auto ext  = dasmIncRead<Word>(addr);
     auto reg  = _____________xxx (op);
     auto mode = ___xxx__________ (ext);
     auto mask = _______xxxx_____ (ext);
@@ -84,7 +84,7 @@ template <Instr I, Mode M, Size S> void
 Moira::dasmPFlusha(StrWriter &str, u32 &addr, u16 op) const
 {
     auto old = addr;
-    auto ext = dasmRead<Word>(addr);
+    auto ext = dasmIncRead<Word>(addr);
 
     // Catch illegal extension words
     if (str.style.syntax == DASM_GNU || str.style.syntax == DASM_GNU_MIT) {
@@ -119,7 +119,7 @@ template <Instr I, Mode M, Size S> void
 Moira::dasmPLoad(StrWriter &str, u32 &addr, u16 op) const
 {
     auto old = addr;
-    auto ext = dasmRead<Word>(addr);
+    auto ext = dasmIncRead<Word>(addr);
     auto ea  = Op <M,S> ( _____________xxx(op), addr );
 
     // Catch illegal extension words
@@ -141,7 +141,7 @@ template <Instr I, Mode M, Size S> void
 Moira::dasmPMove(StrWriter &str, u32 &addr, u16 op) const
 {
     auto old  = addr;
-    auto ext  = dasmRead<Word>(addr);
+    auto ext  = dasmIncRead<Word>(addr);
     auto reg  = _____________xxx (op);
     auto fmt  = xxx_____________ (ext);
     auto preg = ___xxx__________ (ext);
@@ -223,7 +223,7 @@ template <Instr I, Mode M, Size S> void
 Moira::dasmPTest(StrWriter &str, u32 &addr, u16 op) const
 {
     auto old = addr;
-    auto ext = dasmRead<Word>(addr);
+    auto ext = dasmIncRead<Word>(addr);
     auto reg = _____________xxx (op);
     auto lev = ___xxx__________ (ext);
     auto rw  = ______x_________ (ext);
diff --git a/Emulator/CPU/Moira/MoiraDasm_cpp.h b/Emulator/CPU/Moira/MoiraDasm_cpp.h
index 13e2b698b..5a68b41a1 100644
--- a/Emulator/CPU/Moira/MoiraDasm_cpp.h
+++ b/Emulator/CPU/Moira/MoiraDasm_cpp.h
@@ -6,7 +6,7 @@
 // -----------------------------------------------------------------------------
 
 int
-Moira::disassemble(u32 addr, char *str) const
+Moira::disassemble(char *str, u32 addr) const
 {
     if constexpr (ENABLE_DASM == false) {
         throw std::runtime_error("This feature requires ENABLE_DASM = true\n");
@@ -15,13 +15,13 @@ Moira::disassemble(u32 addr, char *str) const
     u32 pc = addr;
     u16 opcode = read16Dasm(pc);
 
-    StrWriter writer(str, style);
+    StrWriter writer(str, instrStyle);
 
     (this->*dasm[opcode])(writer, pc, opcode);
     writer << Finish{};
 
     // Post process disassembler output
-    switch (style.letterCase) {
+    switch (instrStyle.letterCase) {
 
         case DASM_MIXED_CASE:
 
@@ -46,31 +46,7 @@ Moira::disassemble(u32 addr, char *str) const
 }
 
 void
-Moira::disassembleWord(u32 value, char *str) const
-{
-    sprintx(str, value, { .prefix = "", .radix = 16, .upperCase = true }, 4);
-}
-
-void
-Moira::disassembleMemory(u32 addr, int cnt, char *str) const
-{
-    U32_DEC(addr, 2); // Because dasmRead increases addr first
-
-    for (int i = 0; i < cnt; i++) {
-        u32 value = dasmRead<Word>(addr);
-        sprintx(str, value, { .prefix = "", .radix = 16, .upperCase = true }, 4);
-        *str++ = (i == cnt - 1) ? 0 : ' ';
-    }
-}
-
-void
-Moira::disassemblePC(u32 pc, char *str) const
-{
-    sprintx(str, pc, { .prefix = "", .radix = 16, .upperCase = true }, 6);
-}
-
-void
-Moira::disassembleSR(const StatusRegister &sr, char *str) const
+Moira::disassembleSR(char *str, const StatusRegister &sr) const
 {
     str[0]  = sr.t1 ? 'T' : 't';
     str[1]  = sr.t0 ? 'T' : 't';
@@ -91,19 +67,78 @@ Moira::disassembleSR(const StatusRegister &sr, char *str) const
     str[16] = 0;
 }
 
+void
+Moira::dump8(char *str, u8 value) const
+{
+    StrWriter(str, dataStyle) << UInt8{value} << Finish{};
+}
+
+void
+Moira::dump16(char *str, u16 value) const
+{
+    StrWriter(str, dataStyle) << UInt16{value} << Finish{};
+}
+
+void
+Moira::dump24(char *str, u32 value) const
+{
+    StrWriter(str, dataStyle) << UInt24{value} << Finish{};
+}
+
+void
+Moira::dump32(char *str, u32 value) const
+{
+    StrWriter(str, dataStyle) << UInt32{value} << Finish{};
+}
+
+void
+Moira::dump16(char *str, u16 values[], isize cnt) const
+{
+    StrWriter writer(str, dataStyle);
+
+    for (int i = 0; i < cnt; i++) {
+
+        for (isize j = 0; i && j < dataStyle.tab; j++) writer << ' ';
+        writer << UInt16{values[i]} << Finish{};
+    }
+}
+
+void
+Moira::dump16(char *str, u32 addr, isize cnt) const
+{
+    StrWriter writer(str, dataStyle);
+
+    for (int i = 0; i < cnt; i++) {
+
+        for (isize j = 0; i && j < dataStyle.tab; j++) writer << ' ';
+        writer << UInt16{u16(dasmRead<Word>(addr))} << Finish{};
+        U32_INC(addr, 2);
+    }
+}
+
 template <Size S> u32
-Moira::dasmRead(u32 &addr) const
+Moira::dasmRead(u32 addr) const
 {
     switch (S) {
 
-        case Byte:
+        case Long:
 
-            U32_INC(addr, 2);
-            return read16Dasm(addr) & 0xFF;
+            return dasmRead<Word>(addr) << 16 | dasmRead<Word>(U32_ADD(addr, 2));
+
+        default:
+
+            return read16Dasm(addr);
+    }
+}
+
+template <Size S> u32
+Moira::dasmIncRead(u32 &addr) const
+{
+    switch (S) {
 
         case Long:
 
-            return dasmRead<Word>(addr) << 16 | dasmRead<Word>(addr);
+            return dasmIncRead<Word>(addr) << 16 | dasmIncRead<Word>(addr);
 
         default:
 
@@ -126,19 +161,19 @@ Moira::Op(u16 reg, u32 &pc) const
         case 7:  // ABS.W
         case 9:  // (d,PC)
         {
-            result.ext1 = dasmRead<Word>(pc);
+            result.ext1 = dasmIncRead<Word>(pc);
             break;
         }
         case 8:  // ABS.L
         {
-            result.ext1 = dasmRead<Word>(pc);
-            result.ext1 = result.ext1 << 16 | dasmRead<Word>(pc);
+            result.ext1 = dasmIncRead<Word>(pc);
+            result.ext1 = result.ext1 << 16 | dasmIncRead<Word>(pc);
             break;
         }
         case 6:  // (d,An,Xi)
         case 10: // (d,PC,Xi)
         {
-            result.ext1 = dasmRead<Word>(pc);
+            result.ext1 = dasmIncRead<Word>(pc);
             result.ext2 = 0;
             result.ext3 = 0;
 
@@ -148,21 +183,21 @@ Moira::Op(u16 reg, u32 &pc) const
                 result.ow = u8(outerDispWords((u16)result.ext1));
 
                 // Compensate Musashi bug (?)
-                if (style.syntax == DASM_MUSASHI && (result.ext1 & 0x47) >= 0x44) {
+                if (instrStyle.syntax == DASM_MUSASHI && (result.ext1 & 0x47) >= 0x44) {
 
                     result.ow = 0;
                 }
 
-                if (result.dw == 1) result.ext2 = (i16)dasmRead<Word>(pc);
-                if (result.dw == 2) result.ext2 = (i32)dasmRead<Long>(pc);
-                if (result.ow == 1) result.ext3 = (i16)dasmRead<Word>(pc);
-                if (result.ow == 2) result.ext3 = (i32)dasmRead<Long>(pc);
+                if (result.dw == 1) result.ext2 = (i16)dasmIncRead<Word>(pc);
+                if (result.dw == 2) result.ext2 = (i32)dasmIncRead<Long>(pc);
+                if (result.ow == 1) result.ext3 = (i16)dasmIncRead<Word>(pc);
+                if (result.ow == 2) result.ext3 = (i32)dasmIncRead<Long>(pc);
             }
             break;
         }
         case 11: // Imm
         {
-            result.ext1 = dasmRead<S>(pc);
+            result.ext1 = dasmIncRead<S>(pc);
             break;
         }
         default:
@@ -306,7 +341,7 @@ Moira::dasmAdda(StrWriter &str, u32 &addr, u16 op) const
 template <Instr I, Mode M, Size S> void
 Moira::dasmAddiRg(StrWriter &str, u32 &addr, u16 op) const
 {
-    auto src = dasmRead<S>(addr);
+    auto src = dasmIncRead<S>(addr);
     auto dst = Dn ( _____________xxx(op) );
 
     str << Ins<I>{} << Sz<S>{} << str.tab << Ims<S>(src) << Sep{} << dst;
@@ -315,7 +350,7 @@ Moira::dasmAddiRg(StrWriter &str, u32 &addr, u16 op) const
 template <Instr I, Mode M, Size S> void
 Moira::dasmAddiEa(StrWriter &str, u32 &addr, u16 op) const
 {
-    auto src = dasmRead<S>(addr);
+    auto src = dasmIncRead<S>(addr);
     auto dst = Op <M,S> ( _____________xxx(op), addr );
 
     str << Ins<I>{} << Sz<S>{} << str.tab << Ims<S>(src) << Sep{} << dst;
@@ -423,7 +458,7 @@ Moira::dasmAndRgEa(StrWriter &str, u32 &addr, u16 op) const
 template <Instr I, Mode M, Size S> void
 Moira::dasmAndiRg(StrWriter &str, u32 &addr, u16 op) const
 {
-    auto src = dasmRead<S>(addr);
+    auto src = dasmIncRead<S>(addr);
     auto dst = _____________xxx(op);
 
     if (str.style.syntax == DASM_MUSASHI) {
@@ -436,7 +471,7 @@ Moira::dasmAndiRg(StrWriter &str, u32 &addr, u16 op) const
 template <Instr I, Mode M, Size S> void
 Moira::dasmAndiEa(StrWriter &str, u32 &addr, u16 op) const
 {
-    auto src = dasmRead<S>(addr);
+    auto src = dasmIncRead<S>(addr);
     auto dst = Op <M,S> ( _____________xxx(op), addr );
 
     if (str.style.syntax == DASM_MUSASHI) {
@@ -449,7 +484,7 @@ Moira::dasmAndiEa(StrWriter &str, u32 &addr, u16 op) const
 template <Instr I, Mode M, Size S> void
 Moira::dasmAndiccr(StrWriter &str, u32 &addr, u16 op) const
 {
-    auto src = dasmRead<S>(addr);
+    auto src = dasmIncRead<S>(addr);
 
     if (str.style.syntax == DASM_MUSASHI) {
         str << Ins<I>{} << str.tab << Imu{src} << Sep{} << Ccr{};
@@ -461,7 +496,7 @@ Moira::dasmAndiccr(StrWriter &str, u32 &addr, u16 op) const
 template <Instr I, Mode M, Size S> void
 Moira::dasmAndisr(StrWriter &str, u32 &addr, u16 op) const
 {
-    auto src = dasmRead<S>(addr);
+    auto src = dasmIncRead<S>(addr);
 
     if (str.style.syntax == DASM_MUSASHI) {
         str << Ins<I>{} << str.tab << Imu{src} << Sep{} << Sr{};
@@ -474,7 +509,7 @@ template <Instr I, Mode M, Size S> void
 Moira::dasmBitFieldDn(StrWriter &str, u32 &addr, u16 op) const
 {
     auto old = addr;
-    auto ext = dasmRead <Word>(addr);
+    auto ext = dasmIncRead <Word>(addr);
     auto dst = _____________xxx(op);
     auto o   = _____xxxxx______(ext);
     auto w   = ___________xxxxx(ext);
@@ -567,7 +602,7 @@ Moira::dasmBsr(StrWriter &str, u32 &addr, u16 op) const
 template <Instr I, Mode M, Size S> void
 Moira::dasmCallm(StrWriter &str, u32 &addr, u16 op) const
 {
-    auto src = dasmRead<Byte>(addr);
+    auto src = dasmIncRead(addr) & 0xFF;
     auto dst = Op<M, S>( _____________xxx(op), addr );
 
     switch (str.style.syntax) {
@@ -588,7 +623,7 @@ template <Instr I, Mode M, Size S> void
 Moira::dasmCas(StrWriter &str, u32 &addr, u16 op) const
 {
     auto old = addr;
-    auto ext = dasmRead <Word> (addr);
+    auto ext = dasmIncRead <Word> (addr);
     auto dc  = Dn ( _____________xxx(ext) );
     auto du  = Dn ( _______xxx______(ext) );
     auto dst = Op <M,S> ( _____________xxx(op), addr );
@@ -609,7 +644,7 @@ template <Instr I, Mode M, Size S> void
 Moira::dasmCas2(StrWriter &str, u32 &addr, u16 op) const
 {
     auto old = addr;
-    auto ext = dasmRead <Long> (addr);
+    auto ext = dasmIncRead <Long> (addr);
     auto dc1 = Dn ( (ext >> 16) & 0b111  );
     auto dc2 = Dn ( (ext >> 0)  & 0b111  );
     auto du1 = Dn ( (ext >> 22) & 0b111  );
@@ -671,7 +706,7 @@ template <Instr I, Mode M, Size S> void
 Moira::dasmChkCmp2(StrWriter &str, u32 &addr, u16 op) const
 {
     auto old = addr;
-    auto ext = dasmRead <Word> (addr);
+    auto ext = dasmIncRead <Word> (addr);
     auto src = Op <M,S> ( _____________xxx(op), addr );
     auto dst = Rn       ( xxxx____________(ext)      );
 
@@ -720,7 +755,7 @@ Moira::dasmCmpa(StrWriter &str, u32 &addr, u16 op) const
 template <Instr I, Mode M, Size S> void
 Moira::dasmCmpiRg(StrWriter &str, u32 &addr, u16 op) const
 {
-    auto src = dasmRead<S>(addr);
+    auto src = dasmIncRead<S>(addr);
     auto dst = Dn ( _____________xxx(op) );
 
     str << Ins<I>{} << Sz<S>{} << str.tab << Ims<S>(src) << Sep{} << dst;
@@ -730,7 +765,7 @@ Moira::dasmCmpiRg(StrWriter &str, u32 &addr, u16 op) const
 template <Instr I, Mode M, Size S> void
 Moira::dasmCmpiEa(StrWriter &str, u32 &addr, u16 op) const
 {
-    auto src = dasmRead<S>(addr);
+    auto src = dasmIncRead<S>(addr);
     auto dst = Op <M,S> ( _____________xxx(op), addr );
 
     str << Ins<I>{} << Sz<S>{} << str.tab << Ims<S>(src) << Sep{} << dst;
@@ -758,9 +793,9 @@ Moira::dasmCpBcc(StrWriter &str, u32 &addr, u16 op) const
     auto id   = ( ____xxx_________(op) );
     auto cnd  = ( __________xxxxxx(op) );
     auto pc   = addr + 2;
-    auto ext1 = dasmRead<Word>(addr);
-    auto disp = dasmRead<S>(addr);
-    auto ext2 = dasmRead<Word>(addr);
+    auto ext1 = dasmIncRead<Word>(addr);
+    auto disp = dasmIncRead<S>(addr);
+    auto ext2 = dasmIncRead<Word>(addr);
 
     pc += SEXT<S>(disp);
 
@@ -778,15 +813,15 @@ Moira::dasmCpDbcc(StrWriter &str, u32 &addr, u16 op) const
     }
 
     auto pc   = addr + 2;
-    auto ext1 = dasmRead<Word>(addr);
-    auto ext2 = dasmRead<Word>(addr);
+    auto ext1 = dasmIncRead<Word>(addr);
+    auto ext2 = dasmIncRead<Word>(addr);
 
     auto dn   = ( _____________xxx(op)   );
     auto id   = ( ____xxx_________(op)   );
     auto cnd  = ( __________xxxxxx(ext1) );
 
-    auto ext3 = dasmRead<Word>(addr);
-    auto ext4 = dasmRead<Word>(addr);
+    auto ext3 = dasmIncRead<Word>(addr);
+    auto ext4 = dasmIncRead<Word>(addr);
 
     pc += i16(ext3);
 
@@ -804,7 +839,7 @@ Moira::dasmCpGen(StrWriter &str, u32 &addr, u16 op) const
     }
 
     auto id  = ( ____xxx_________(op) );
-    auto ext = Imu ( dasmRead<Long>(addr) );
+    auto ext = Imu ( dasmIncRead<Long>(addr) );
 
     str << id << Ins<I>{} << str.tab << ext;
     str << Av<I, M, S>{};
@@ -855,9 +890,9 @@ Moira::dasmCpScc(StrWriter &str, u32 &addr, u16 op) const
 
     auto dn   = ( _____________xxx(op) );
     auto id   = ( ____xxx_________(op) );
-    auto ext1 = dasmRead<Word>(addr);
+    auto ext1 = dasmIncRead<Word>(addr);
     auto cnd  = ( __________xxxxxx(ext1) );
-    auto ext2 = dasmRead<Word>(addr);
+    auto ext2 = dasmIncRead<Word>(addr);
     auto ea   = Op<M, S>(dn, addr);
 
     str << id << Ins<I>{} << Cpcc{cnd} << str.tab << ea;
@@ -873,19 +908,19 @@ Moira::dasmCpTrapcc(StrWriter &str, u32 &addr, u16 op) const
         return;
     }
 
-    auto ext1 = dasmRead<Word>(addr);
+    auto ext1 = dasmIncRead<Word>(addr);
     auto id   = ( ____xxx_________(op)   );
     auto cnd  = ( __________xxxxxx(ext1) );
 
     if (id == 0) {
 
-        auto ext2 = dasmRead<Word>(addr);
+        auto ext2 = dasmIncRead<Word>(addr);
 
         switch (op & 0b111) {
 
             case 0b010:
             {
-                auto ext = dasmRead<Word>(addr);
+                auto ext = dasmIncRead<Word>(addr);
                 str << id << Ins<I>{} << Cpcc{cnd} << Tab{9};
                 str << Tab{10} << Imu(ext);
                 str << "; (extension = " << Int(ext2) << ") (2-3)";
@@ -893,7 +928,7 @@ Moira::dasmCpTrapcc(StrWriter &str, u32 &addr, u16 op) const
             }
             case 0b011:
             {
-                auto ext = dasmRead<Long>(addr);
+                auto ext = dasmIncRead<Long>(addr);
                 str << id << Ins<I>{} << Cpcc{cnd} << Tab{9};
                 str << Tab{10} << Imu(ext);
                 str << "; (extension = " << Int(ext2) << ") (2-3)";
@@ -901,7 +936,7 @@ Moira::dasmCpTrapcc(StrWriter &str, u32 &addr, u16 op) const
             }
             case 0b100:
             {
-                // (void)dasmRead<Long>(addr);
+                // (void)dasmIncRead<Long>(addr);
                 str << id << Ins<I>{} << Cpcc{cnd} << Tab{9};
                 str << "; (extension = " << Int(ext2) << ") (2-3)";
                 break;
@@ -915,13 +950,13 @@ Moira::dasmCpTrapcc(StrWriter &str, u32 &addr, u16 op) const
 
     } else {
 
-        auto ext2 = dasmRead<Word>(addr);
+        auto ext2 = dasmIncRead<Word>(addr);
 
         switch (op & 0b111) {
 
             case 0b010:
             {
-                auto ext = dasmRead<Word>(addr);
+                auto ext = dasmIncRead<Word>(addr);
                 str << id << Ins<I>{} << Cpcc{cnd} << Tab{9};
                 str << Tab{10} << Imu(ext);
                 str << "; (extension = " << Int(ext2) << ") (2-3)";
@@ -929,7 +964,7 @@ Moira::dasmCpTrapcc(StrWriter &str, u32 &addr, u16 op) const
             }
             case 0b011:
             {
-                auto ext = dasmRead<Long>(addr);
+                auto ext = dasmIncRead<Long>(addr);
                 str << id << Ins<I>{} << Cpcc{cnd} << Tab{9};
                 str << Tab{10} << Imu(ext);
                 str << "; (extension = " << Int(ext2) << ") (2-3)";
@@ -937,7 +972,7 @@ Moira::dasmCpTrapcc(StrWriter &str, u32 &addr, u16 op) const
             }
             case 0b100:
             {
-                // (void)dasmRead<Long>(addr);
+                // (void)dasmIncRead<Long>(addr);
                 str << id << Ins<I>{} << Cpcc{cnd} << Tab{9};
                 str << "; (extension = " << Int(ext2) << ") (2-3)";
                 break;
@@ -956,7 +991,7 @@ Moira::dasmBcc(StrWriter &str, u32 &addr, u16 op) const
 {
     u32 dst = addr;
     U32_INC(dst, 2);
-    U32_INC(dst, S == Byte ? (i8)op : SEXT<S>(dasmRead<S>(addr)));
+    U32_INC(dst, S == Byte ? (i8)op : SEXT<S>(dasmIncRead<S>(addr)));
 
     switch (str.style.syntax) {
 
@@ -1011,7 +1046,7 @@ Moira::dasmBitDxEa(StrWriter &str, u32 &addr, u16 op) const
 template <Instr I, Mode M, Size S> void
 Moira::dasmBitImDy(StrWriter &str, u32 &addr, u16 op) const
 {
-    auto src = dasmRead<S>(addr);
+    auto src = dasmIncRead<S>(addr);
     auto dst = Op <M,S> ( _____________xxx(op), addr );
 
     switch (str.style.syntax) {
@@ -1031,7 +1066,7 @@ Moira::dasmBitImDy(StrWriter &str, u32 &addr, u16 op) const
 template <Instr I, Mode M, Size S> void
 Moira::dasmBitImEa(StrWriter &str, u32 &addr, u16 op) const
 {
-    auto src = dasmRead<S>(addr);
+    auto src = dasmIncRead<S>(addr);
     auto dst = Op <M,S> ( _____________xxx(op), addr );
 
     switch (str.style.syntax) {
@@ -1054,7 +1089,7 @@ Moira::dasmDbcc(StrWriter &str, u32 &addr, u16 op) const
     auto src = Dn ( _____________xxx(op) );
     auto dst = addr + 2;
 
-    U32_INC(dst, (i16)dasmRead<Word>(addr));
+    U32_INC(dst, (i16)dasmIncRead<Word>(addr));
 
     str << Ins<I>{} << str.tab << src << Sep{} << UInt(dst);
 }
@@ -1131,7 +1166,7 @@ Moira::dasmLea(StrWriter &str, u32 &addr, u16 op) const
 template <Instr I, Mode M, Size S> void
 Moira::dasmLink(StrWriter &str, u32 &addr, u16 op) const
 {
-    auto dsp = dasmRead<S>(addr);
+    auto dsp = dasmIncRead<S>(addr);
     auto src = An ( _____________xxx(op) );
 
     switch (str.style.syntax) {
@@ -1232,7 +1267,7 @@ Moira::dasmMovea(StrWriter &str, u32 &addr, u16 op) const
 template <Instr I, Mode M, Size S> void
 Moira::dasmMovecRcRx(StrWriter &str, u32 &addr, u16 op) const
 {
-    auto ext = u16(dasmRead<Word>(addr));
+    auto ext = u16(dasmIncRead<Word>(addr));
     auto src = Cn(____xxxxxxxxxxxx(ext));
     auto dst = Rn(xxxx____________(ext));
 
@@ -1243,7 +1278,7 @@ Moira::dasmMovecRcRx(StrWriter &str, u32 &addr, u16 op) const
 template <Instr I, Mode M, Size S> void
 Moira::dasmMovecRxRc(StrWriter &str, u32 &addr, u16 op) const
 {
-    auto ext = u16(dasmRead<Word>(addr));
+    auto ext = u16(dasmIncRead<Word>(addr));
     auto dst = Cn(____xxxxxxxxxxxx(ext));
     auto src = Rn(xxxx____________(ext));
 
@@ -1254,7 +1289,7 @@ Moira::dasmMovecRxRc(StrWriter &str, u32 &addr, u16 op) const
 template <Instr I, Mode M, Size S> void
 Moira::dasmMovemEaRg(StrWriter &str, u32 &addr, u16 op) const
 {
-    auto dst = RegRegList ( (u16)dasmRead<Word>(addr)  );
+    auto dst = RegRegList ( (u16)dasmIncRead<Word>(addr)  );
     auto src = Op <M,S>   ( _____________xxx(op), addr );
 
     str << Ins<I>{} << Sz<S>{} << str.tab << src << Sep{} << dst;
@@ -1263,7 +1298,7 @@ Moira::dasmMovemEaRg(StrWriter &str, u32 &addr, u16 op) const
 template <Instr I, Mode M, Size S> void
 Moira::dasmMovemRgEa(StrWriter &str, u32 &addr, u16 op) const
 {
-    auto src = RegRegList ( (u16)dasmRead<Word>(addr)  );
+    auto src = RegRegList ( (u16)dasmIncRead<Word>(addr)  );
     auto dst = Op <M,S>   ( _____________xxx(op), addr );
 
     if constexpr (M == 4) { src.raw = REVERSE_16(src.raw); }
@@ -1301,7 +1336,7 @@ template <Instr I, Mode M, Size S> void
 Moira::dasmMoves(StrWriter &str, u32 &addr, u16 op) const
 {
     auto old = addr;
-    auto ext = (u16)dasmRead<Word>(addr);
+    auto ext = (u16)dasmIncRead<Word>(addr);
     auto ea = Op <M,S> ( _____________xxx(op), addr );
     auto rg = Rn ( xxxx____________(ext) );
 
@@ -1491,7 +1526,7 @@ template <Instr I, Mode M, Size S> void
 Moira::dasmMull(StrWriter &str, u32 &addr, u16 op) const
 {
     auto old = addr;
-    auto ext = dasmRead <Word> (addr);
+    auto ext = dasmIncRead <Word> (addr);
     auto src = Op <M,S> ( _____________xxx(op), addr );
     auto dl  = Dn       ( _xxx____________(ext)      );
     auto dh  = Dn       ( _____________xxx(ext)      );
@@ -1543,7 +1578,7 @@ template <Instr I, Mode M, Size S> void
 Moira::dasmDivl(StrWriter &str, u32 &addr, u16 op) const
 {
     auto old = addr;
-    auto ext = dasmRead <Word> (addr);
+    auto ext = dasmIncRead <Word> (addr);
     auto src = Op <M,S> ( _____________xxx(op), addr );
     auto dl  = Dn       ( _xxx____________(ext)      );
     auto dh  = Dn       ( _____________xxx(ext)      );
@@ -1612,7 +1647,7 @@ Moira::dasmNop(StrWriter &str, u32 &addr, u16 op) const
 template <Instr I, Mode M, Size S> void
 Moira::dasmPackDn(StrWriter &str, u32 &addr, u16 op) const
 {
-    auto ext = dasmRead <Word> (addr);
+    auto ext = dasmIncRead <Word> (addr);
     auto rx = Op <M,S> ( _____________xxx(op), addr );
     auto ry = Op <M,S> ( ____xxx_________(op), addr );
 
@@ -1654,7 +1689,7 @@ Moira::dasmReset(StrWriter &str, u32 &addr, u16 op) const
 template <Instr I, Mode M, Size S> void
 Moira::dasmRtd(StrWriter &str, u32 &addr, u16 op) const
 {
-    auto disp = dasmRead<Word>(addr);
+    auto disp = dasmIncRead<Word>(addr);
 
     str << Ins<I>{} << str.tab << Ims<Word>(disp);
     str << Av<I, M, S>{};
@@ -1706,7 +1741,7 @@ Moira::dasmSccEa(StrWriter &str, u32 &addr, u16 op) const
 template <Instr I, Mode M, Size S> void
 Moira::dasmStop(StrWriter &str, u32 &addr, u16 op) const
 {
-    auto src = dasmRead<S>(addr);
+    auto src = dasmIncRead<S>(addr);
 
     str << Ins<I>{} << str.tab << Ims<S>(src);
 }
@@ -1783,7 +1818,7 @@ Moira::dasmTrapcc(StrWriter &str, u32 &addr, u16 op) const
                 case Word:
                 case Long:
 
-                    auto ext = dasmRead<S>(addr);
+                    auto ext = dasmIncRead<S>(addr);
                     str << Ins<I>{} << Sz<S>{} << str.tab << Ims<S>(ext);
                     break;
             }
@@ -1801,7 +1836,7 @@ Moira::dasmTrapcc(StrWriter &str, u32 &addr, u16 op) const
                 case Word:
                 case Long:
 
-                    auto ext = dasmRead<S>(addr);
+                    auto ext = dasmIncRead<S>(addr);
                     str << Ins<I>{} << str.tab << Imu(ext);
                     break;
             }
@@ -1830,7 +1865,7 @@ Moira::dasmUnlk(StrWriter &str, u32 &addr, u16 op) const
 template <Instr I, Mode M, Size S> void
 Moira::dasmUnpkDn(StrWriter &str, u32 &addr, u16 op) const
 {
-    auto ext = dasmRead <Word> (addr);
+    auto ext = dasmIncRead <Word> (addr);
     auto rx = Op <M,S> ( _____________xxx(op), addr );
     auto ry = Op <M,S> ( ____xxx_________(op), addr );
 
@@ -1906,7 +1941,7 @@ template <Instr I, Mode M, Size S> void
 Moira::dasmMove16PiPi(StrWriter &str, u32 &addr, u16 op) const
 {
     auto old = addr;
-    auto ext = dasmRead<Word>(addr);
+    auto ext = dasmIncRead<Word>(addr);
     auto ax  = _____________xxx(op);
     auto ay  = _xxx____________(ext);
 
@@ -1924,7 +1959,7 @@ Moira::dasmMove16PiPi(StrWriter &str, u32 &addr, u16 op) const
 template <Instr I, Mode M, Size S> void
 Moira::dasmMove16PiAl(StrWriter &str, u32 &addr, u16 op) const
 {
-    auto ext = dasmRead<Long>(addr);
+    auto ext = dasmIncRead<Long>(addr);
     auto ay  = _____________xxx(op);
 
     str << Ins<I>{} << str.tab << Op<MODE_PI>(ay, addr) << Sep{} << UInt(ext);
@@ -1934,7 +1969,7 @@ Moira::dasmMove16PiAl(StrWriter &str, u32 &addr, u16 op) const
 template <Instr I, Mode M, Size S> void
 Moira::dasmMove16AlPi(StrWriter &str, u32 &addr, u16 op) const
 {
-    auto ext = dasmRead<Long>(addr);
+    auto ext = dasmIncRead<Long>(addr);
     auto ay  = _____________xxx(op);
 
     str << Ins<I>{} << str.tab << UInt(ext) << Sep{} << Op<MODE_PI>(ay, addr);
@@ -1944,7 +1979,7 @@ Moira::dasmMove16AlPi(StrWriter &str, u32 &addr, u16 op) const
 template <Instr I, Mode M, Size S> void
 Moira::dasmMove16AiAl(StrWriter &str, u32 &addr, u16 op) const
 {
-    auto ext = dasmRead<Long>(addr);
+    auto ext = dasmIncRead<Long>(addr);
     auto ay  = _____________xxx(op);
 
     str << Ins<I>{} << str.tab << Op<MODE_AI>(ay, addr) << Sep{} << UInt(ext);
@@ -1954,7 +1989,7 @@ Moira::dasmMove16AiAl(StrWriter &str, u32 &addr, u16 op) const
 template <Instr I, Mode M, Size S> void
 Moira::dasmMove16AlAi(StrWriter &str, u32 &addr, u16 op) const
 {
-    auto ext = dasmRead<Long>(addr);
+    auto ext = dasmIncRead<Long>(addr);
     auto ay  = _____________xxx(op);
 
     str << Ins<I>{} << str.tab << UInt(ext) << Sep{} << Op<MODE_AI>(ay, addr);
diff --git a/Emulator/CPU/Moira/MoiraDataflow_cpp.h b/Emulator/CPU/Moira/MoiraDataflow_cpp.h
index 7fd9b26a9..681bf9cae 100644
--- a/Emulator/CPU/Moira/MoiraDataflow_cpp.h
+++ b/Emulator/CPU/Moira/MoiraDataflow_cpp.h
@@ -605,9 +605,11 @@ Moira::jumpToVector(int nr)
     // Check for address error
     if (misaligned<C>(reg.pc)) {
 
-        assert(nr != 3);
-
-        if (C == C68000) {
+        if (nr == 3) {
+            
+            throw DoubleFault();
+            
+        } else if (C == C68000) {
 
             throw AddressError(makeFrame<F|AE_PROG>(reg.pc, vectorAddr));
 
diff --git a/Emulator/CPU/Moira/MoiraDebugger.cpp b/Emulator/CPU/Moira/MoiraDebugger.cpp
index 62d6bc04f..6fc478408 100644
--- a/Emulator/CPU/Moira/MoiraDebugger.cpp
+++ b/Emulator/CPU/Moira/MoiraDebugger.cpp
@@ -252,7 +252,7 @@ void
 Debugger::stepOver()
 {
     char tmp[64];
-    softStop = moira.getPC() + moira.disassemble(moira.getPC(), tmp);
+    softStop = moira.getPC() + moira.disassemble(tmp, moira.getPC());
     breakpoints.setNeedsCheck(true);
 }
 
diff --git a/Emulator/CPU/Moira/StrWriter.h b/Emulator/CPU/Moira/StrWriter.h
index f1f926dc8..6b5bbd5f6 100644
--- a/Emulator/CPU/Moira/StrWriter.h
+++ b/Emulator/CPU/Moira/StrWriter.h
@@ -20,6 +20,7 @@ struct Int { i32 raw; Int(i32 v) : raw(v) { } };
 struct UInt { u32 raw; UInt(u32 v) : raw(v) { } };
 struct UInt8 { u8 raw; UInt8(u8 v) : raw(v) { } };
 struct UInt16 { u16 raw; UInt16(u16 v) : raw(v) { } };
+struct UInt24 { u32 raw; UInt24(u32 v) : raw(v) { } };
 struct UInt32 { u32 raw; UInt32(u32 v) : raw(v) { } };
 
 // Immediate operands
@@ -120,6 +121,7 @@ class StrWriter
     StrWriter& operator<<(UInt);
     StrWriter& operator<<(UInt8);
     StrWriter& operator<<(UInt16);
+    StrWriter& operator<<(UInt24);
     StrWriter& operator<<(UInt32);
 
     StrWriter& operator<<(Imu);
diff --git a/Emulator/CPU/Moira/StrWriter_cpp.h b/Emulator/CPU/Moira/StrWriter_cpp.h
index 5590a9259..a87965249 100644
--- a/Emulator/CPU/Moira/StrWriter_cpp.h
+++ b/Emulator/CPU/Moira/StrWriter_cpp.h
@@ -197,6 +197,17 @@ StrWriter::operator<<(UInt16 u)
     return *this;
 }
 
+StrWriter&
+StrWriter::operator<<(UInt24 u)
+{
+    if (style.numberFormat.radix == 16) {
+        sprintx(ptr, u.raw, style.numberFormat, 6);
+    } else {
+        sprintd(ptr, u.raw, 8);
+    }
+    return *this;
+}
+
 StrWriter&
 StrWriter::operator<<(UInt32 u)
 {
diff --git a/Emulator/Denise/Denise.cpp b/Emulator/Denise/Denise.cpp
index 2cba2610c..4d63aeca1 100644
--- a/Emulator/Denise/Denise.cpp
+++ b/Emulator/Denise/Denise.cpp
@@ -18,7 +18,7 @@ namespace vamiga {
 
 Denise::Denise(Amiga& ref) : SubComponent(ref)
 {    
-    subComponents = std::vector<AmigaComponent *> {
+    subComponents = std::vector<CoreComponent *> {
         
         &pixelEngine,
         &screenRecorder
diff --git a/Emulator/Denise/Denise.h b/Emulator/Denise/Denise.h
index 3a2e47f4b..a04129975 100644
--- a/Emulator/Denise/Denise.h
+++ b/Emulator/Denise/Denise.h
@@ -318,7 +318,7 @@ class Denise : public SubComponent {
 
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 private:
@@ -328,7 +328,7 @@ class Denise : public SubComponent {
     
     
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
     
 private:
@@ -440,7 +440,7 @@ class Denise : public SubComponent {
 
 public:
     
-    DeniseInfo getInfo() const { return AmigaComponent::getInfo(info); }
+    DeniseInfo getInfo() const { return CoreComponent::getInfo(info); }
 
     
     //
diff --git a/Emulator/Denise/DeniseDebugger.cpp b/Emulator/Denise/DeniseDebugger.cpp
index b725c9b8d..1ce1431fe 100644
--- a/Emulator/Denise/DeniseDebugger.cpp
+++ b/Emulator/Denise/DeniseDebugger.cpp
@@ -16,7 +16,7 @@ namespace vamiga {
 void
 DeniseDebugger::_initialize()
 {
-    AmigaComponent::_initialize();
+    CoreComponent::_initialize();
     
     std::memset(spriteInfo, 0, sizeof(spriteInfo));
     std::memset(latchedSpriteInfo, 0, sizeof(latchedSpriteInfo));
diff --git a/Emulator/Denise/DeniseDebugger.h b/Emulator/Denise/DeniseDebugger.h
index fecea20bd..25fe6e9b3 100644
--- a/Emulator/Denise/DeniseDebugger.h
+++ b/Emulator/Denise/DeniseDebugger.h
@@ -48,7 +48,7 @@ class DeniseDebugger: public SubComponent {
 
 
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 private:
@@ -58,7 +58,7 @@ class DeniseDebugger: public SubComponent {
     
     
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
 
 private:
diff --git a/Emulator/Denise/FrameBuffer.h b/Emulator/Denise/FrameBuffer.h
index 099a0fe70..d107094d5 100644
--- a/Emulator/Denise/FrameBuffer.h
+++ b/Emulator/Denise/FrameBuffer.h
@@ -37,10 +37,18 @@ struct FrameBuffer {
     static constexpr Texel hblank   = grey4;    // HBLANK area
     static constexpr Texel cb1      = grey2;    // Checkerboard color 1
     static constexpr Texel cb2      = grey4;    // Checkerboard color 2
-    
-    Buffer <Texel> pixels;
+
+    // Frame number
     i64 nr;
-    bool longFrame;
+
+    // Pixel buffer
+    Buffer <Texel> pixels;
+
+    // The long-frame bit of this frame
+    bool lof;
+
+    // The long-frame bit of the previous frame
+    bool prevlof;
 
     FrameBuffer();
 
diff --git a/Emulator/Denise/PixelEngine.cpp b/Emulator/Denise/PixelEngine.cpp
index a11166797..2690f5381 100644
--- a/Emulator/Denise/PixelEngine.cpp
+++ b/Emulator/Denise/PixelEngine.cpp
@@ -55,7 +55,7 @@ PixelEngine::_dump(Category category, std::ostream& os) const
 void
 PixelEngine::_initialize()
 {
-    AmigaComponent::_initialize();
+    CoreComponent::_initialize();
 
     // Setup ECS BRDRBLNK color
     palette[64] = TEXEL(GpuColor(0x00, 0x00, 0x00).rawValue);
@@ -73,10 +73,10 @@ PixelEngine::_reset(bool hard)
     
     if (hard) {
         
-        emuTexture[0].longFrame = true;
-        emuTexture[1].longFrame = true;
         emuTexture[0].nr = 0;
+        emuTexture[0].lof = emuTexture[0].prevlof = true;
         emuTexture[1].nr = 0;
+        emuTexture[1].lof = emuTexture[1].prevlof = true;
     }
 
     activeBuffer = 0;
@@ -327,9 +327,14 @@ PixelEngine::stablePtr(isize row, isize col)
 void
 PixelEngine::swapBuffers()
 {
-    activeBuffer = !activeBuffer;
-    emuTexture[activeBuffer].nr = agnus.pos.frame;
-    emuTexture[activeBuffer].longFrame = agnus.pos.lof;
+    isize oldActiveBuffer = activeBuffer;
+    isize newActiveBuffer = !oldActiveBuffer;
+
+    emuTexture[newActiveBuffer].nr = agnus.pos.frame;
+    emuTexture[newActiveBuffer].lof = agnus.pos.lof;
+    emuTexture[newActiveBuffer].prevlof = emuTexture[oldActiveBuffer].lof;
+
+    activeBuffer = newActiveBuffer;
 }
 
 Texel *
diff --git a/Emulator/Denise/PixelEngine.h b/Emulator/Denise/PixelEngine.h
index b7c8bdd57..c521210a8 100644
--- a/Emulator/Denise/PixelEngine.h
+++ b/Emulator/Denise/PixelEngine.h
@@ -98,7 +98,7 @@ class PixelEngine : public SubComponent {
 
 
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 private:
@@ -108,7 +108,7 @@ class PixelEngine : public SubComponent {
 
     
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
     
 private:
diff --git a/Emulator/Denise/Recorder/Recorder.cpp b/Emulator/Denise/Recorder/Recorder.cpp
index 53eb46a71..babe24abe 100644
--- a/Emulator/Denise/Recorder/Recorder.cpp
+++ b/Emulator/Denise/Recorder/Recorder.cpp
@@ -15,7 +15,7 @@ namespace vamiga {
 
 Recorder::Recorder(Amiga& ref) : SubComponent(ref)
 {
-    subComponents = std::vector<AmigaComponent *> {
+    subComponents = std::vector<CoreComponent *> {
         
         &muxer
     };
@@ -24,7 +24,7 @@ Recorder::Recorder(Amiga& ref) : SubComponent(ref)
 void
 Recorder::_initialize()
 {
-    AmigaComponent::_initialize();
+    CoreComponent::_initialize();
 
     FFmpeg::init();
 }
diff --git a/Emulator/Denise/Recorder/Recorder.h b/Emulator/Denise/Recorder/Recorder.h
index 02fcd149d..0749d9773 100644
--- a/Emulator/Denise/Recorder/Recorder.h
+++ b/Emulator/Denise/Recorder/Recorder.h
@@ -90,7 +90,7 @@ class Recorder : public SubComponent {
     
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 private:
@@ -100,7 +100,7 @@ class Recorder : public SubComponent {
     
     
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
     
 private:
diff --git a/Emulator/FileSystems/FSBlock.h b/Emulator/FileSystems/FSBlock.h
index 92fc48aaf..419dca4ea 100644
--- a/Emulator/FileSystems/FSBlock.h
+++ b/Emulator/FileSystems/FSBlock.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "AmigaObject.h"
+#include "CoreObject.h"
 #include "FSTypes.h"
 #include "FSObjects.h"
 #include "Buffer.h"
@@ -21,7 +21,7 @@ using util::Buffer;
 
 namespace vamiga {
 
-struct FSBlock : AmigaObject {
+struct FSBlock : CoreObject {
 
     // The device this block belongs to
     class FileSystem &device;
@@ -49,7 +49,7 @@ struct FSBlock : AmigaObject {
 
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 protected:
diff --git a/Emulator/FileSystems/FSObjects.h b/Emulator/FileSystems/FSObjects.h
index e99e2e170..db653909b 100644
--- a/Emulator/FileSystems/FSObjects.h
+++ b/Emulator/FileSystems/FSObjects.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "AmigaObject.h"
+#include "CoreObject.h"
 
 namespace vamiga {
 
diff --git a/Emulator/FileSystems/FileSystem.h b/Emulator/FileSystems/FileSystem.h
index 14ba67e2e..26ace5605 100644
--- a/Emulator/FileSystems/FileSystem.h
+++ b/Emulator/FileSystems/FileSystem.h
@@ -33,7 +33,7 @@ class HardDrive;
  *
  * See also: MutableFileSystem
  */
-class FileSystem : public AmigaObject {
+class FileSystem : public CoreObject {
     
     friend struct FSBlock;
     friend struct FSHashTable;
@@ -89,7 +89,7 @@ class FileSystem : public AmigaObject {
 
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 protected:
diff --git a/Emulator/Headless.cpp b/Emulator/Headless.cpp
index b1fe9df2f..3d463eaf6 100644
--- a/Emulator/Headless.cpp
+++ b/Emulator/Headless.cpp
@@ -7,10 +7,12 @@
 // See https://www.gnu.org for license information
 // -----------------------------------------------------------------------------
 
-
 #include "config.h"
 #include "Headless.h"
 #include "Script.h"
+#include "SelfTestScript.h"
+#include <filesystem>
+#include <chrono>
 
 #ifndef _WIN32
 #include <getopt.h>
@@ -20,13 +22,13 @@ int main(int argc, char *argv[])
 {
     try {
         
-        vamiga::Headless().main(argc, argv);
+        return vamiga::Headless().main(argc, argv);
         
     } catch (vamiga::SyntaxError &e) {
         
-        std::cout << "Usage: ";
-        std::cout << "vAmigaCore [-vm] <script>" << std::endl;
+        std::cout << "Usage: vAmigaCore [-svm] | { [-vm] <script> } " << std::endl;
         std::cout << std::endl;
+        std::cout << "       -s or --selftest  Checks the integrity of the build" << std::endl;
         std::cout << "       -v or --verbose   Print executed script lines" << std::endl;
         std::cout << "       -m or --messages  Observe the message queue" << std::endl;
         std::cout << std::endl;
@@ -59,7 +61,7 @@ int main(int argc, char *argv[])
 
 namespace vamiga {
 
-void
+int
 Headless::main(int argc, char *argv[])
 {
     std::cout << "vAmiga Headless v" << amiga.version();
@@ -76,16 +78,21 @@ Headless::main(int argc, char *argv[])
     
     // Register message receiver
     amiga.msgQueue.setListener(this, vamiga::process);
-    
+
+    // Launch the emulator thread
+    amiga.launch();
+
     // Execute the script
     barrier.lock();
     script.execute(amiga);
 
-    while (!halt) {
+    while (!returnCode) {
         
         barrier.lock();
         amiga.retroShell.continueScript();
     }
+
+    return *returnCode;
 }
 
 #ifdef _WIN32
@@ -93,7 +100,9 @@ Headless::main(int argc, char *argv[])
 void
 Headless::parseArguments(int argc, char *argv[])
 {
-    keys["arg1"] = util::makeAbsolutePath("default.ini");
+    keys["selftest"] = "1";
+    keys["verbose"] = "1";
+    keys["arg1"] = selfTestScript();
 }
 
 #else
@@ -103,6 +112,7 @@ Headless::parseArguments(int argc, char *argv[])
 {
     static struct option long_options[] = {
         
+        { "selftest",   no_argument,    NULL,   's' },
         { "verbose",    no_argument,    NULL,   'v' },
         { "messages",   no_argument,    NULL,   'm' },
         { NULL,         0,              NULL,    0  }
@@ -117,11 +127,15 @@ Headless::parseArguments(int argc, char *argv[])
     // Parse all options
     while (1) {
         
-        int arg = getopt_long(argc, argv, ":vm", long_options, NULL);
+        int arg = getopt_long(argc, argv, ":svm", long_options, NULL);
         if (arg == -1) break;
 
         switch (arg) {
                 
+            case 's':
+                keys["selftest"] = "1";
+                break;
+
             case 'v':
                 keys["verbose"] = "1";
                 break;
@@ -145,8 +159,12 @@ Headless::parseArguments(int argc, char *argv[])
     while (optind < argc) {
         keys["arg" + std::to_string(nr++)] = util::makeAbsolutePath(argv[optind++]);
     }
-    
+
+    // Check for syntax errors
     checkArguments();
+
+    // Create the selftest script if needed
+    if (keys.find("selftest") != keys.end()) keys["arg1"] = selfTestScript();
 }
 
 #endif
@@ -154,18 +172,40 @@ Headless::parseArguments(int argc, char *argv[])
 void
 Headless::checkArguments()
 {
-    // The user needs to specify a single input file
-    if (keys.find("arg1") == keys.end()) {
-        throw SyntaxError("No script file is given");
-    }
-    if (keys.find("arg2") != keys.end()) {
-        throw SyntaxError("More than one script file is given");
+    if (keys.find("selftest") != keys.end()) {
+
+        // No input file must be given
+        if (keys.find("arg1") != keys.end()) {
+            throw SyntaxError("No script file must be given in selftest mode");
+        }
+
+    } else {
+
+        // The user needs to specify a single input file
+        if (keys.find("arg1") == keys.end()) {
+            throw SyntaxError("No script file is given");
+        }
+        if (keys.find("arg2") != keys.end()) {
+            throw SyntaxError("More than one script file is given");
+        }
+
+        // The input file must exist
+        if (!util::fileExists(keys["arg1"])) {
+            throw SyntaxError("File " + keys["arg1"] + " does not exist");
+        }
     }
+}
+
+string
+Headless::selfTestScript()
+{
+    auto path = std::filesystem::temp_directory_path() / "selftest.ini";
+    auto file = std::ofstream(path);
 
-    // The input file must exist
-    if (!util::fileExists(keys["arg1"])) {
-        throw SyntaxError("File " + keys["arg1"] + " does not exist");
+    for (isize i = 0; i < isizeof(script) / isizeof(const char *); i++) {
+        file << script[i] << std::endl;
     }
+    return path.string();
 }
 
 void
@@ -189,20 +229,26 @@ Headless::process(long type, i32 d1, i32 d2, i32 d3, i32 d4)
     switch (type) {
             
         case MSG_SCRIPT_DONE:
+
+            returnCode = 0;
+            break;
+
         case MSG_SCRIPT_ABORT:
         case MSG_ABORT:
 
-            halt = true;
-            [[fallthrough]];
-            
-        case MSG_SCRIPT_WAKEUP:
+            returnCode = 1;
+            break;
+
+        case MSG_SCRIPT_PAUSE:
 
-            barrier.unlock();
+            std::this_thread::sleep_for(std::chrono::seconds(d2));
             break;
 
         default:
             break;
     }
+
+    barrier.unlock();
 }
 
 }
diff --git a/Emulator/Headless.h b/Emulator/Headless.h
index 40ac4e909..21d56ae6e 100644
--- a/Emulator/Headless.h
+++ b/Emulator/Headless.h
@@ -31,11 +31,11 @@ class Headless {
     // The emulator instance
     Amiga amiga;
 
-    // Barrier for syncing the script execution
+    // Barrier for syncing script execution
     util::Mutex barrier;
 
-    // Exit flag
-    bool halt = false;
+    // Return code
+    std::optional<int> returnCode;
 
     
     //
@@ -45,7 +45,7 @@ class Headless {
 public:
 
     // Main entry point
-    void main(int argc, char *argv[]);
+    int main(int argc, char *argv[]);
 
 private:
 
@@ -55,7 +55,10 @@ class Headless {
     // Checks all command line arguments for conistency
     void checkArguments() throws;
 
-    
+    // Returns the path to the self-test script
+    string selfTestScript();
+
+
     //
     // Running
     //
diff --git a/Emulator/LogicBoard/ControlPort.cpp b/Emulator/LogicBoard/ControlPort.cpp
index a1c8b8a66..9acf22fda 100644
--- a/Emulator/LogicBoard/ControlPort.cpp
+++ b/Emulator/LogicBoard/ControlPort.cpp
@@ -19,7 +19,7 @@ ControlPort::ControlPort(Amiga& ref, isize nr) : SubComponent(ref), nr(nr)
 {
     assert(nr == PORT1 || nr == PORT2);
 
-    subComponents = std::vector<AmigaComponent *> { &mouse, &joystick };
+    subComponents = std::vector<CoreComponent *> { &mouse, &joystick };
 }
 
 const char *
diff --git a/Emulator/LogicBoard/ControlPort.h b/Emulator/LogicBoard/ControlPort.h
index 8c4535980..022f78f79 100644
--- a/Emulator/LogicBoard/ControlPort.h
+++ b/Emulator/LogicBoard/ControlPort.h
@@ -67,7 +67,7 @@ class ControlPort : public SubComponent {
 
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 private:
@@ -77,7 +77,7 @@ class ControlPort : public SubComponent {
     
     
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
     
 private:
@@ -114,7 +114,7 @@ class ControlPort : public SubComponent {
 
 public:
     
-    ControlPortInfo getInfo() const { return AmigaComponent::getInfo(info); }
+    ControlPortInfo getInfo() const { return CoreComponent::getInfo(info); }
 
     bool isPort1() const { return nr == PORT1; }
     bool isPort2() const { return nr == PORT2; }
diff --git a/Emulator/LogicBoard/RTC.h b/Emulator/LogicBoard/RTC.h
index 9453bc415..a1bdb54a0 100644
--- a/Emulator/LogicBoard/RTC.h
+++ b/Emulator/LogicBoard/RTC.h
@@ -52,7 +52,7 @@ class RTC : public SubComponent {
     
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 private:
@@ -62,7 +62,7 @@ class RTC : public SubComponent {
 
     
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
     
 private:
diff --git a/Emulator/LogicBoard/SerialPort.h b/Emulator/LogicBoard/SerialPort.h
index e5a6e23d3..149f3ddba 100644
--- a/Emulator/LogicBoard/SerialPort.h
+++ b/Emulator/LogicBoard/SerialPort.h
@@ -45,7 +45,7 @@ class SerialPort : public SubComponent {
 
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 private:
@@ -55,7 +55,7 @@ class SerialPort : public SubComponent {
     
     
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
     
 private:
@@ -104,7 +104,7 @@ class SerialPort : public SubComponent {
     
 public:
 
-    SerialPortInfo getInfo() const { return AmigaComponent::getInfo(info); }
+    SerialPortInfo getInfo() const { return CoreComponent::getInfo(info); }
 
 
     //
diff --git a/Emulator/Media/AmigaFile.h b/Emulator/Media/AmigaFile.h
index 30982bad3..135d6ff34 100644
--- a/Emulator/Media/AmigaFile.h
+++ b/Emulator/Media/AmigaFile.h
@@ -10,7 +10,7 @@
 #pragma once
 
 #include "AmigaFileTypes.h"
-#include "AmigaObject.h"
+#include "CoreObject.h"
 #include "Checksum.h"
 #include "IOUtils.h"
 #include "Buffer.h"
@@ -60,7 +60,7 @@ namespace vamiga {
  *   ---------   ---------   ---------   ---------    ---------  ---------
  */
 
-class AmigaFile : public AmigaObject {
+class AmigaFile : public CoreObject {
     
 public:
     
@@ -90,7 +90,7 @@ class AmigaFile : public AmigaObject {
 
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 private:
@@ -114,7 +114,8 @@ class AmigaFile : public AmigaObject {
     virtual string sizeAsString();
     
     // Returns a fingerprint (hash value) for this file
-    virtual u64 fnv() const { return data.fnv64(); }
+    virtual u64 fnv64() const { return data.fnv64(); }
+    virtual u32 crc32() const { return data.crc32(); }
 
     
     //
diff --git a/Emulator/Media/DiskFiles/ADFFile.cpp b/Emulator/Media/DiskFiles/ADFFile.cpp
index 363e66127..d8d1ef5a0 100644
--- a/Emulator/Media/DiskFiles/ADFFile.cpp
+++ b/Emulator/Media/DiskFiles/ADFFile.cpp
@@ -340,8 +340,8 @@ ADFFile::encodeSector(FloppyDisk &disk, Track t, Sector s) const
     //     Data checksum       56      8     Odd/Even encoded
     
     // Determine the start of this sector
-    u8 *p = disk.data.track[t] + 700 + (s * 1088);
-    
+    u8 *p = disk.data.track[t] + (s * 1088);
+
     // Bytes before SYNC
     p[0] = (p[-1] & 1) ? 0x2A : 0xAA;
     p[1] = 0xAA;
diff --git a/Emulator/Media/DiskFiles/ADFFile.h b/Emulator/Media/DiskFiles/ADFFile.h
index c50608045..fd03ec01a 100644
--- a/Emulator/Media/DiskFiles/ADFFile.h
+++ b/Emulator/Media/DiskFiles/ADFFile.h
@@ -60,7 +60,7 @@ class ADFFile : public FloppyFile {
 
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
 
 public:
diff --git a/Emulator/Media/DiskFiles/DMSFile.h b/Emulator/Media/DiskFiles/DMSFile.h
index 987c92237..a57f3f07b 100644
--- a/Emulator/Media/DiskFiles/DMSFile.h
+++ b/Emulator/Media/DiskFiles/DMSFile.h
@@ -43,7 +43,7 @@ class DMSFile : public FloppyFile {
     //
     
     FileType type() const override { return FILETYPE_DMS; }
-    u64 fnv() const override { return adf.fnv(); }
+    u64 fnv64() const override { return adf.fnv64(); }
     bool isCompatiblePath(const string &path) const override { return isCompatible(path); }
     bool isCompatibleStream(std::istream &stream) const override { return isCompatible(stream); }
     void finalizeRead() throws override;
diff --git a/Emulator/Media/DiskFiles/EXEFile.h b/Emulator/Media/DiskFiles/EXEFile.h
index 22f41b875..22122e03c 100644
--- a/Emulator/Media/DiskFiles/EXEFile.h
+++ b/Emulator/Media/DiskFiles/EXEFile.h
@@ -43,7 +43,7 @@ class EXEFile : public FloppyFile {
     //
     
     FileType type() const override { return FILETYPE_EXE; }
-    u64 fnv() const override { return adf.fnv(); }
+    u64 fnv64() const override { return adf.fnv64(); }
     bool isCompatiblePath(const string &path) const override { return isCompatible(path); }
     bool isCompatibleStream(std::istream &stream) const override { return isCompatible(stream); }
     void finalizeRead() throws override;
diff --git a/Emulator/Media/DiskFiles/EXTFile.h b/Emulator/Media/DiskFiles/EXTFile.h
index eb8f7b9c6..215806bc0 100644
--- a/Emulator/Media/DiskFiles/EXTFile.h
+++ b/Emulator/Media/DiskFiles/EXTFile.h
@@ -70,7 +70,7 @@ class EXTFile : public FloppyFile {
 
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
 
 public:
diff --git a/Emulator/Media/DiskFiles/Folder.h b/Emulator/Media/DiskFiles/Folder.h
index 25bd868d3..1b92a774b 100644
--- a/Emulator/Media/DiskFiles/Folder.h
+++ b/Emulator/Media/DiskFiles/Folder.h
@@ -35,7 +35,7 @@ class Folder : public FloppyFile {
     
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 public:
@@ -50,7 +50,7 @@ class Folder : public FloppyFile {
     bool isCompatiblePath(const string &path) const override { return isCompatible(path); }
     bool isCompatibleStream(std::istream &stream) const override { return isCompatible(stream); }
     FileType type() const override { return FILETYPE_DIR; }
-    u64 fnv() const override { return adf->fnv(); }
+    u64 fnv64() const override { return adf->fnv64(); }
     
     
     //
diff --git a/Emulator/Media/DiskFiles/HDFFile.h b/Emulator/Media/DiskFiles/HDFFile.h
index ad9b13461..2d756af41 100644
--- a/Emulator/Media/DiskFiles/HDFFile.h
+++ b/Emulator/Media/DiskFiles/HDFFile.h
@@ -157,9 +157,6 @@ class HDFFile : public DiskFile {
 
     // Extracts the DOS revision number from a certain block
     FSVolumeType dos(isize nr) const;
-    
-    // Returns a loadable device drive
-    // [[deprecated]] void readDriver(isize nr, Buffer<u8> &driver);
 
     
     //
diff --git a/Emulator/Media/DiskFiles/IMGFile.h b/Emulator/Media/DiskFiles/IMGFile.h
index db1ca900d..71c32923b 100644
--- a/Emulator/Media/DiskFiles/IMGFile.h
+++ b/Emulator/Media/DiskFiles/IMGFile.h
@@ -44,7 +44,7 @@ class IMGFile : public FloppyFile {
 
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 public:
diff --git a/Emulator/Memory/Memory.cpp b/Emulator/Memory/Memory.cpp
index 12165e4fa..74531f64a 100644
--- a/Emulator/Memory/Memory.cpp
+++ b/Emulator/Memory/Memory.cpp
@@ -105,7 +105,7 @@ Memory::_dump(Category category, std::ostream& os) const
 void
 Memory::_initialize()
 {
-    AmigaComponent::_initialize();
+    CoreComponent::_initialize();
     
     if (auto romPath = Amiga::defaults.getString("ROM_PATH"); romPath != "") {
 
@@ -2707,7 +2707,7 @@ Memory::patch(u32 addr, u8 value)
         case MEM_EXT:           patch <MEM_EXT>      (addr, value); return;
             
         default:
-            fatalError;
+            break;
     }
 }
 
diff --git a/Emulator/Memory/Memory.h b/Emulator/Memory/Memory.h
index c379f0741..5b82dc3c1 100644
--- a/Emulator/Memory/Memory.h
+++ b/Emulator/Memory/Memory.h
@@ -205,7 +205,7 @@ class Memory : public SubComponent {
 
 
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 private:
@@ -215,7 +215,7 @@ class Memory : public SubComponent {
     
     
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
     
 private:
diff --git a/Emulator/Misc/OSDebugger/OSDebugger.h b/Emulator/Misc/OSDebugger/OSDebugger.h
index dff746d2f..21989189b 100644
--- a/Emulator/Misc/OSDebugger/OSDebugger.h
+++ b/Emulator/Misc/OSDebugger/OSDebugger.h
@@ -29,7 +29,7 @@ class OSDebugger : public SubComponent {
     
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 private:
@@ -39,7 +39,7 @@ class OSDebugger : public SubComponent {
 
     
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
 
 private:
diff --git a/Emulator/Misc/OSDebugger/OSDescriptors.cpp b/Emulator/Misc/OSDebugger/OSDescriptors.cpp
index d63d98fe7..e9ad9cf60 100644
--- a/Emulator/Misc/OSDebugger/OSDescriptors.cpp
+++ b/Emulator/Misc/OSDebugger/OSDescriptors.cpp
@@ -9,7 +9,7 @@
 
 #include "config.h"
 #include "OSDescriptors.h"
-#include "AmigaObject.h"
+#include "CoreObject.h"
 #include "MemUtils.h"
 #include "IOUtils.h"
 #include "Error.h"
diff --git a/Emulator/Misc/OSDebugger/OSDescriptors.h b/Emulator/Misc/OSDebugger/OSDescriptors.h
index 008fb866e..c7d1e54c8 100644
--- a/Emulator/Misc/OSDebugger/OSDescriptors.h
+++ b/Emulator/Misc/OSDebugger/OSDescriptors.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "AmigaObject.h"
+#include "CoreObject.h"
 #include "Buffer.h"
 #include <vector>
 
diff --git a/Emulator/Misc/RegressionTester/RegressionTester.cpp b/Emulator/Misc/RegressionTester/RegressionTester.cpp
index 10ea071a7..32563d777 100644
--- a/Emulator/Misc/RegressionTester/RegressionTester.cpp
+++ b/Emulator/Misc/RegressionTester/RegressionTester.cpp
@@ -30,7 +30,7 @@ RegressionTester::prepare(ConfigScheme scheme, string rom, string ext)
     amiga.configure(scheme);
 
     // Load Kickstart Rom
-    amiga.mem.loadRom(rom.c_str());
+    if (rom != "") amiga.mem.loadRom(rom.c_str());
     
     // Load Extension Rom (if provided)
     if (ext != "") amiga.mem.loadExt(ext.c_str());
diff --git a/Emulator/Misc/RegressionTester/RegressionTester.h b/Emulator/Misc/RegressionTester/RegressionTester.h
index 11bca2969..a0e607252 100644
--- a/Emulator/Misc/RegressionTester/RegressionTester.h
+++ b/Emulator/Misc/RegressionTester/RegressionTester.h
@@ -17,7 +17,7 @@ namespace vamiga {
 
 class RegressionTester : public SubComponent {
 
-    // Pixel area that is written to the test image
+    // Pixel area ritten to the test image
     static constexpr isize X1 = 4 * 0x31;
     static constexpr isize Y1 = VBLANK_MAX + 1;
     static constexpr isize X2 = HPIXELS;
@@ -28,7 +28,7 @@ class RegressionTester : public SubComponent {
     // Filename of the test image
     string dumpTexturePath = "texture";
 
-    // Pixel area that is used for regression testing
+    // Pixel ares observed by this regression test
     isize x1 = X1;
     isize y1 = Y1;
     isize x2 = X2;
@@ -50,7 +50,7 @@ class RegressionTester : public SubComponent {
     
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 private:
@@ -60,18 +60,12 @@ class RegressionTester : public SubComponent {
 
     
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
 
 private:
     
     void _reset(bool hard) override { };
-    
-    
-    //
-    // Serializing
-    //
-    
     isize _size() override { return 0; }
     u64 _checksum() override { return 0; }
     isize _load(const u8 *buffer) override { return 0; }
@@ -84,8 +78,8 @@ class RegressionTester : public SubComponent {
 
 public:
 
-    // Reverts everything to factory settings
-    void prepare(ConfigScheme scheme, string rom, string ext = "");
+    // Reverts to factory settings
+    void prepare(ConfigScheme scheme, string rom = "", string ext = "");
     
     // Runs a test case
     void run(string adf);
diff --git a/Emulator/Misc/RemoteServers/GdbServer.h b/Emulator/Misc/RemoteServers/GdbServer.h
index 6021e2312..1f88d01a1 100644
--- a/Emulator/Misc/RemoteServers/GdbServer.h
+++ b/Emulator/Misc/RemoteServers/GdbServer.h
@@ -58,7 +58,7 @@ class GdbServer : public RemoteServer {
     
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 private:
@@ -68,7 +68,7 @@ class GdbServer : public RemoteServer {
     
     
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
     
     void resetConfig() override;
diff --git a/Emulator/Misc/RemoteServers/RemoteManager.cpp b/Emulator/Misc/RemoteServers/RemoteManager.cpp
index deb9bc7a2..4078e609d 100644
--- a/Emulator/Misc/RemoteServers/RemoteManager.cpp
+++ b/Emulator/Misc/RemoteServers/RemoteManager.cpp
@@ -17,7 +17,7 @@ namespace vamiga {
 
 RemoteManager::RemoteManager(Amiga& ref) : SubComponent(ref)
 {
-    subComponents = std::vector<AmigaComponent *> {
+    subComponents = std::vector<CoreComponent *> {
         
         &serServer,
         &rshServer,
diff --git a/Emulator/Misc/RemoteServers/RemoteManager.h b/Emulator/Misc/RemoteServers/RemoteManager.h
index 1233d5e7c..4d002775e 100644
--- a/Emulator/Misc/RemoteServers/RemoteManager.h
+++ b/Emulator/Misc/RemoteServers/RemoteManager.h
@@ -43,7 +43,7 @@ class RemoteManager : public SubComponent {
     
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 protected:
@@ -53,7 +53,7 @@ class RemoteManager : public SubComponent {
     
     
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
     
 private:
diff --git a/Emulator/Misc/RemoteServers/RemoteServer.h b/Emulator/Misc/RemoteServers/RemoteServer.h
index 4f15be3f7..a83fcfe3f 100644
--- a/Emulator/Misc/RemoteServers/RemoteServer.h
+++ b/Emulator/Misc/RemoteServers/RemoteServer.h
@@ -53,7 +53,7 @@ class RemoteServer : public SubComponent {
     
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 public:
@@ -63,7 +63,7 @@ class RemoteServer : public SubComponent {
     
     
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
     
 private:
diff --git a/Emulator/Misc/RemoteServers/RshServer.h b/Emulator/Misc/RemoteServers/RshServer.h
index 2645b5850..692761e3a 100644
--- a/Emulator/Misc/RemoteServers/RshServer.h
+++ b/Emulator/Misc/RemoteServers/RshServer.h
@@ -20,7 +20,7 @@ class RshServer : public RemoteServer {
     RshServer(Amiga& ref);
 
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 protected:
@@ -30,7 +30,7 @@ class RshServer : public RemoteServer {
 
     
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
 
     void resetConfig() override;
diff --git a/Emulator/Misc/RemoteServers/SerServer.h b/Emulator/Misc/RemoteServers/SerServer.h
index 5f66d9b14..09c7ee9f7 100644
--- a/Emulator/Misc/RemoteServers/SerServer.h
+++ b/Emulator/Misc/RemoteServers/SerServer.h
@@ -45,7 +45,7 @@ class SerServer : public RemoteServer {
     
 
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 protected:
@@ -55,7 +55,7 @@ class SerServer : public RemoteServer {
 
     
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
 
     void resetConfig() override;
diff --git a/Emulator/Misc/RemoteServers/Socket.h b/Emulator/Misc/RemoteServers/Socket.h
index 59da5f56f..bd6b3e3d0 100644
--- a/Emulator/Misc/RemoteServers/Socket.h
+++ b/Emulator/Misc/RemoteServers/Socket.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "AmigaObject.h"
+#include "CoreObject.h"
 
 #ifdef _WIN32
 
@@ -32,7 +32,7 @@ namespace vamiga { typedef int SOCKET; }
 
 namespace vamiga {
 
-class Socket : public AmigaObject {
+class Socket : public CoreObject {
 
     SOCKET socket;
 
@@ -60,7 +60,7 @@ class Socket : public AmigaObject {
 
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 private:
diff --git a/Emulator/Paula/Audio/AudioFilter.h b/Emulator/Paula/Audio/AudioFilter.h
index da3075ce6..058582ec3 100644
--- a/Emulator/Paula/Audio/AudioFilter.h
+++ b/Emulator/Paula/Audio/AudioFilter.h
@@ -45,7 +45,7 @@ class AudioFilter : public SubComponent {
     
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 private:
@@ -55,7 +55,7 @@ class AudioFilter : public SubComponent {
 
     
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
     
 private:
diff --git a/Emulator/Paula/Audio/Muxer.cpp b/Emulator/Paula/Audio/Muxer.cpp
index f60add28f..85024697a 100644
--- a/Emulator/Paula/Audio/Muxer.cpp
+++ b/Emulator/Paula/Audio/Muxer.cpp
@@ -20,7 +20,7 @@ namespace vamiga {
 
 Muxer::Muxer(Amiga& ref) : SubComponent(ref)
 {
-    subComponents = std::vector<AmigaComponent *> {
+    subComponents = std::vector<CoreComponent *> {
 
         &filterL,
         &filterR
@@ -251,19 +251,10 @@ Muxer::setSampleRate(double hz)
 {
     trace(AUD_DEBUG, "setSampleRate(%f)\n", hz);
 
-    adjustSpeed();
-
     filterL.setSampleRate(hz);
     filterR.setSampleRate(hz);
 }
 
-void
-Muxer::adjustSpeed()
-{
-    cyclesPerSample = double(amiga.masterClockFrequency()) / host.getSampleRate();
-    assert(cyclesPerSample > 0);
-}
-
 isize
 Muxer::didLoadFromBuffer(const u8 *buffer)
 {
@@ -304,24 +295,13 @@ Muxer::synthesize(Cycle clock, Cycle target, long count)
     assert(count > 0);
 
     // Determine the number of elapsed cycles per audio sample
-    double cyclesPerSample = (double)(target - clock) / (double)count;
+    double cps = (double)(target - clock) / (double)count;
 
     switch (config.samplingMethod) {
             
-        case SMP_NONE:
-            
-            synthesize<SMP_NONE>(clock, count, cyclesPerSample);
-            break;
-            
-        case SMP_NEAREST:
-            
-            synthesize<SMP_NEAREST>(clock, count, cyclesPerSample);
-            break;
-            
-        case SMP_LINEAR:
-            
-            synthesize<SMP_LINEAR>(clock, count, cyclesPerSample);
-            break;
+        case SMP_NONE:      synthesize<SMP_NONE>(clock, count, cps); break;
+        case SMP_NEAREST:   synthesize<SMP_NEAREST>(clock, count, cps); break;
+        case SMP_LINEAR:    synthesize<SMP_LINEAR>(clock, count, cps); break;
             
         default:
             fatalError;
@@ -332,28 +312,21 @@ void
 Muxer::synthesize(Cycle clock, Cycle target)
 {
     assert(target > clock);
-    assert(cyclesPerSample > 0);
-    
+
+    // Determine the number of elapsed cycles per audio sample
+    double cps = double(amiga.masterClockFrequency()) / host.getSampleRate();
+
     // Determine how many samples we need to produce
-    double exact = (double)(target - clock) / cyclesPerSample + fraction;
-    long count = (long)exact;
-    fraction = exact - (double)count;
+    double exact = (double)(target - clock) / cps + fraction;
+
+    // Extract the integer part and remember the rest
+    double count; fraction = std::modf(exact, &count);
 
     switch (config.samplingMethod) {
-        case SMP_NONE:
-            
-            synthesize<SMP_NONE>(clock, count, cyclesPerSample);
-            break;
-            
-        case SMP_NEAREST:
-            
-            synthesize<SMP_NEAREST>(clock, count, cyclesPerSample);
-            break;
-            
-        case SMP_LINEAR:
-            
-            synthesize<SMP_LINEAR>(clock, count, cyclesPerSample);
-            break;
+
+        case SMP_NONE:      synthesize<SMP_NONE>(clock, long(count), cps); break;
+        case SMP_NEAREST:   synthesize<SMP_NEAREST>(clock, long(count), cps); break;
+        case SMP_LINEAR:    synthesize<SMP_LINEAR>(clock, long(count), cps); break;
             
         default:
             fatalError;
diff --git a/Emulator/Paula/Audio/Muxer.h b/Emulator/Paula/Audio/Muxer.h
index 9b439c299..8de6dbabd 100644
--- a/Emulator/Paula/Audio/Muxer.h
+++ b/Emulator/Paula/Audio/Muxer.h
@@ -52,7 +52,7 @@ class Muxer : public SubComponent {
     MuxerStats stats = {};
     
     // Master clock cycles per audio sample
-    double cyclesPerSample = 0.0;
+    // double cyclesPerSample = 0.0;
 
     // Fraction of a sample that hadn't been generated in synthesize
     double fraction = 0.0;
@@ -108,7 +108,7 @@ class Muxer : public SubComponent {
 
 
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 private:
@@ -118,7 +118,7 @@ class Muxer : public SubComponent {
     
     
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
     
 private:
@@ -171,9 +171,6 @@ class Muxer : public SubComponent {
     // double getSampleRate() const { return sampleRate; }
     void setSampleRate(double hz);
 
-    // Needs to be called when the sampling rate or the CPU speed changes
-    void adjustSpeed();
-
 
     //
     // Analyzing
@@ -211,8 +208,11 @@ class Muxer : public SubComponent {
     //
     
 public:
-    
+
+    // Entry point for the screen recorder
     void synthesize(Cycle clock, Cycle target, long count);
+
+    // Entry point for the core emulator
     void synthesize(Cycle clock, Cycle target);
 
 private:
diff --git a/Emulator/Paula/Audio/StateMachine.h b/Emulator/Paula/Audio/StateMachine.h
index b764a67ef..b1932bfd0 100644
--- a/Emulator/Paula/Audio/StateMachine.h
+++ b/Emulator/Paula/Audio/StateMachine.h
@@ -85,7 +85,7 @@ class StateMachine : public SubComponent {
 
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 private:
@@ -95,7 +95,7 @@ class StateMachine : public SubComponent {
 
     
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
     
 private:
@@ -149,7 +149,7 @@ class StateMachine : public SubComponent {
     
 public:
     
-    StateMachineInfo getInfo() const { return AmigaComponent::getInfo(info); }
+    StateMachineInfo getInfo() const { return CoreComponent::getInfo(info); }
 
     
     //
diff --git a/Emulator/Paula/DiskController/DiskController.h b/Emulator/Paula/DiskController/DiskController.h
index fab01167f..e93046a23 100644
--- a/Emulator/Paula/DiskController/DiskController.h
+++ b/Emulator/Paula/DiskController/DiskController.h
@@ -102,7 +102,7 @@ class DiskController : public SubComponent
 
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 private:
@@ -176,7 +176,7 @@ class DiskController : public SubComponent
     
 public:
     
-    DiskControllerInfo getInfo() const { return AmigaComponent::getInfo(info); }
+    DiskControllerInfo getInfo() const { return CoreComponent::getInfo(info); }
 
 
     //
diff --git a/Emulator/Paula/Paula.cpp b/Emulator/Paula/Paula.cpp
index be64da0d8..0693377c3 100644
--- a/Emulator/Paula/Paula.cpp
+++ b/Emulator/Paula/Paula.cpp
@@ -17,7 +17,7 @@ namespace vamiga {
 
 Paula::Paula(Amiga& ref) : SubComponent(ref)
 {
-    subComponents = std::vector<AmigaComponent *> {
+    subComponents = std::vector<CoreComponent *> {
         
         &channel0,
         &channel1,
diff --git a/Emulator/Paula/Paula.h b/Emulator/Paula/Paula.h
index 38bbe2238..72f08a79d 100644
--- a/Emulator/Paula/Paula.h
+++ b/Emulator/Paula/Paula.h
@@ -109,7 +109,7 @@ class Paula : public SubComponent {
     
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 private:
@@ -119,7 +119,7 @@ class Paula : public SubComponent {
 
     
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
 
 private:
@@ -178,8 +178,7 @@ class Paula : public SubComponent {
     
 public:
     
-    PaulaInfo getInfo() const { return AmigaComponent::getInfo(info); }
-    // AudioInfo getAudioInfo() const { return AmigaComponent::getInfo(audioInfo); }
+    PaulaInfo getInfo() const { return CoreComponent::getInfo(info); }
 
 
     //
diff --git a/Emulator/Paula/UART/UART.h b/Emulator/Paula/UART/UART.h
index e5816cfb2..063a26df5 100644
--- a/Emulator/Paula/UART/UART.h
+++ b/Emulator/Paula/UART/UART.h
@@ -54,7 +54,7 @@ class UART : public SubComponent {
     
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 private:
@@ -64,7 +64,7 @@ class UART : public SubComponent {
 
     
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
     
 private:
@@ -105,7 +105,7 @@ class UART : public SubComponent {
 
 public:
 
-    UARTInfo getInfo() const { return AmigaComponent::getInfo(info); }
+    UARTInfo getInfo() const { return CoreComponent::getInfo(info); }
 
 
     //
diff --git a/Emulator/Peripherals/Drive/Drive.h b/Emulator/Peripherals/Drive/Drive.h
index 02572091c..76d096cdb 100644
--- a/Emulator/Peripherals/Drive/Drive.h
+++ b/Emulator/Peripherals/Drive/Drive.h
@@ -63,9 +63,6 @@ class Drive : public SubComponent {
     // Managing disks
     //
     
-    // Returns a fingerprint for the current disk or 0 if there is none
-    // virtual u64 fnv() const = 0;
-
     // Checks whether the drive contains a disk of a certain kind
     virtual bool hasDisk() const = 0;
     virtual bool hasModifiedDisk() const = 0;
diff --git a/Emulator/Peripherals/Drive/FloppyDisk.cpp b/Emulator/Peripherals/Drive/FloppyDisk.cpp
index ad716ec5e..52b33f22c 100644
--- a/Emulator/Peripherals/Drive/FloppyDisk.cpp
+++ b/Emulator/Peripherals/Drive/FloppyDisk.cpp
@@ -284,6 +284,41 @@ FloppyDisk::encodeDisk(const FloppyFile &file)
 
     // Call the MFM encoder
     file.encodeDisk(*this);
+
+    // Rectify the track alignment
+
+    /* By default, all tracks are arranged to start at the same offset position.
+     * Some disks, however, are known to require a different alignment to work
+     * in vAmiga. We check for these disks and align the tracks accordingly.
+     */
+    /*
+    switch (file.crc32()) {
+
+        case 0x4db280dd:    // T2 - The Arcade Game (1993)(Virgin)[cr FLT].adf
+        case 0xb41e9935:    // T2 - The Arcade Game (1993)(Virgin)[cr FLT](Disk 1 of 2).adf
+        case 0x889f7bbe:    // T2 - The Arcade Game (1993)(Virgin)[cr FLT](Disk 1 of 2)[t +4 MST].adf
+
+            shiftTracks(20);
+            break;
+    }
+    */
+}
+
+void
+FloppyDisk::shiftTracks(isize offset)
+{
+    debug(true, "Shifting tracks by %zd bytes against each other\n", offset);
+
+    u8 spare[2 * 32768];
+
+    for (Track t = 0; t < 168; t++) {
+
+        isize len = length.track[t];
+
+        memcpy(spare, data.track[t], len);
+        memcpy(spare + len, data.track[t], len);
+        memcpy(data.track[t], spare + (len + t * offset) % len, len);
+    }
 }
 
 void
diff --git a/Emulator/Peripherals/Drive/FloppyDisk.h b/Emulator/Peripherals/Drive/FloppyDisk.h
index d90ba1576..b0275d038 100644
--- a/Emulator/Peripherals/Drive/FloppyDisk.h
+++ b/Emulator/Peripherals/Drive/FloppyDisk.h
@@ -10,7 +10,7 @@
 #pragma once
 
 #include "FloppyDiskTypes.h"
-#include "AmigaComponent.h"
+#include "CoreComponent.h"
 
 namespace vamiga {
 
@@ -51,7 +51,7 @@ class FloppyFile;
  *    - a disk usually occupies 84 * 2 * 12.664 =  2.127.552 MFM bytes
  */
 
-class FloppyDisk : public AmigaObject {
+class FloppyDisk : public CoreObject {
     
     friend class FloppyDrive;
     friend class ADFFile;
@@ -113,7 +113,7 @@ class FloppyDisk : public AmigaObject {
     
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 private:
@@ -224,7 +224,10 @@ class FloppyDisk : public AmigaObject {
     
     // Encodes a disk
     void encodeDisk(const class FloppyFile &file);
-    
+
+    // Shifts the tracks agains each other
+    void shiftTracks(isize offset);
+
     
     //
     // Working with MFM encoded data streams
diff --git a/Emulator/Peripherals/Drive/FloppyDrive.cpp b/Emulator/Peripherals/Drive/FloppyDrive.cpp
index 6da0ac60e..f794e6a61 100644
--- a/Emulator/Peripherals/Drive/FloppyDrive.cpp
+++ b/Emulator/Peripherals/Drive/FloppyDrive.cpp
@@ -217,10 +217,10 @@ FloppyDrive::_dump(Category category, std::ostream& os) const
         os << dec(AS_USEC(getStepPulseDelay())) << " usec" << std::endl;
         os << tab("Reverse step pulse delay");
         os << dec(AS_USEC(getRevStepPulseDelay())) << " usec" << std::endl;
-        os << tab("Step read delay");
-        os << dec(AS_MSEC(getStepReadDelay())) << " msec" << std::endl;
-        os << tab("Reverse step read delay");
-        os << dec(AS_MSEC(getRevStepReadDelay())) << " msec" << std::endl;
+        os << tab("Track to track delay");
+        os << dec(AS_MSEC(getTrackToTrackDelay())) << " msec" << std::endl;
+        os << tab("Head settle time");
+        os << dec(AS_MSEC(getHeadSettleTime())) << " msec" << std::endl;
     }
     
     if (category == Category::Inspection) {
@@ -499,7 +499,7 @@ FloppyDrive::getStepPulseDelay() const
     switch (config.mechanics) {
 
         case MECHANICS_NONE:    return 0;
-        case MECHANICS_A1010:   return 1060;
+        case MECHANICS_A1010:   return USEC(40);
 
         default:
             fatalError;
@@ -512,7 +512,7 @@ FloppyDrive::getRevStepPulseDelay() const
     switch (config.mechanics) {
 
         case MECHANICS_NONE:    return 0;
-        case MECHANICS_A1010:   return 1060;
+        case MECHANICS_A1010:   return USEC(40);
 
         default:
             fatalError;
@@ -520,12 +520,12 @@ FloppyDrive::getRevStepPulseDelay() const
 }
 
 Cycle
-FloppyDrive::getStepReadDelay() const
+FloppyDrive::getTrackToTrackDelay() const
 {
     switch (config.mechanics) {
 
         case MECHANICS_NONE:    return 0;
-        case MECHANICS_A1010:   return MSEC(8);
+        case MECHANICS_A1010:   return MSEC(3);
 
         default:
             fatalError;
@@ -533,12 +533,12 @@ FloppyDrive::getStepReadDelay() const
 }
 
 Cycle
-FloppyDrive::getRevStepReadDelay() const
+FloppyDrive::getHeadSettleTime() const
 {
     switch (config.mechanics) {
 
         case MECHANICS_NONE:    return 0;
-        case MECHANICS_A1010:   return MSEC(8);
+        case MECHANICS_A1010:   return MSEC(9);
 
         default:
             fatalError;
@@ -793,11 +793,7 @@ FloppyDrive::step(isize dir)
             recordCylinder(head.cylinder);
 
             // Determine when the step will be completed
-            if (latestStep == latestStepDown) {
-                latestStepCompleted = agnus.clock + getStepReadDelay();
-            } else {
-                latestStepCompleted = agnus.clock + getRevStepReadDelay();
-            }
+            latestStepCompleted = agnus.clock + getTrackToTrackDelay() + getHeadSettleTime();
 
             // Remember the step cycle
             latestStep = latestStepDown = agnus.clock;
@@ -817,11 +813,7 @@ FloppyDrive::step(isize dir)
             recordCylinder(head.cylinder);
 
             // Determine when the step will be completed
-            if (latestStep == latestStepUp) {
-                latestStepCompleted = agnus.clock + getStepReadDelay();
-            } else {
-                latestStepCompleted = agnus.clock + getRevStepReadDelay();
-            }
+            latestStepCompleted = agnus.clock + getTrackToTrackDelay() + getHeadSettleTime();
 
             // Remember the step cycle
             latestStep = latestStepUp = agnus.clock;
diff --git a/Emulator/Peripherals/Drive/FloppyDrive.h b/Emulator/Peripherals/Drive/FloppyDrive.h
index 674d0dddb..2e78086aa 100644
--- a/Emulator/Peripherals/Drive/FloppyDrive.h
+++ b/Emulator/Peripherals/Drive/FloppyDrive.h
@@ -98,7 +98,7 @@ class FloppyDrive : public Drive {
     
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 private:
@@ -108,7 +108,7 @@ class FloppyDrive : public Drive {
     
     
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
     
 private:
@@ -199,7 +199,7 @@ class FloppyDrive : public Drive {
 public:
     
     // Returns the result of the latest inspection
-    FloppyDriveInfo getInfo() const { return AmigaComponent::getInfo(info); }
+    FloppyDriveInfo getInfo() const { return CoreComponent::getInfo(info); }
 
     // Return the identification pattern of this drive
     u32 getDriveId() const;
@@ -225,9 +225,11 @@ class FloppyDrive : public Drive {
     Cycle getStepPulseDelay() const;
     Cycle getRevStepPulseDelay() const;
 
-    // Returns the time span in which only garbage is read after a head step
-    Cycle getStepReadDelay() const;
-    Cycle getRevStepReadDelay() const;
+    // Returns the duration of a head step
+    Cycle getTrackToTrackDelay() const;
+
+    // Returns how long garbabe is read after a head step
+    Cycle getHeadSettleTime() const;
 
 
     //
diff --git a/Emulator/Peripherals/Drive/HardDrive.cpp b/Emulator/Peripherals/Drive/HardDrive.cpp
index 9f0b33f53..df0544a99 100644
--- a/Emulator/Peripherals/Drive/HardDrive.cpp
+++ b/Emulator/Peripherals/Drive/HardDrive.cpp
@@ -432,14 +432,6 @@ HardDrive::isConnected() const
     return amiga.hdcon[nr]->getConfigItem(OPT_HDC_CONNECT);
 }
 
-/*
-u64
-HardDrive::fnv() const
-{
-    return hasDisk() ? util::fnv64(data.ptr, geometry.numBytes()) : 0;
-}
-*/
-
 bool
 HardDrive::hasDisk() const
 {
diff --git a/Emulator/Peripherals/Drive/HardDrive.h b/Emulator/Peripherals/Drive/HardDrive.h
index 9e4234eb4..e3ca65bda 100644
--- a/Emulator/Peripherals/Drive/HardDrive.h
+++ b/Emulator/Peripherals/Drive/HardDrive.h
@@ -98,7 +98,7 @@ class HardDrive : public Drive {
 
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 private:
@@ -108,7 +108,7 @@ class HardDrive : public Drive {
     
     
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
     
 private:
@@ -178,7 +178,6 @@ class HardDrive : public Drive {
     Head currentHead() const override { return head.head; }
     isize currentOffset() const override { return head.offset; }
 
-    // u64 fnv() const override;
     bool hasDisk() const override;
     bool hasModifiedDisk() const override;
     bool hasProtectedDisk() const override;
@@ -211,7 +210,7 @@ class HardDrive : public Drive {
 public:
 
     // Returns information about the disk or one of its partitions
-    HardDriveInfo getInfo() const { return AmigaComponent::getInfo(info); }
+    HardDriveInfo getInfo() const { return CoreComponent::getInfo(info); }
     const PartitionDescriptor &getPartitionInfo(isize nr);
     
     // Returns the disk geometry
diff --git a/Emulator/Peripherals/Joystick/Joystick.h b/Emulator/Peripherals/Joystick/Joystick.h
index 50698bb33..8646f71e0 100644
--- a/Emulator/Peripherals/Joystick/Joystick.h
+++ b/Emulator/Peripherals/Joystick/Joystick.h
@@ -50,7 +50,7 @@ class Joystick : public SubComponent {
 
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 private:
@@ -60,7 +60,7 @@ class Joystick : public SubComponent {
     
     
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
 
 private:
diff --git a/Emulator/Peripherals/Keyboard/Keyboard.h b/Emulator/Peripherals/Keyboard/Keyboard.h
index da7675602..6dab3cf33 100644
--- a/Emulator/Peripherals/Keyboard/Keyboard.h
+++ b/Emulator/Peripherals/Keyboard/Keyboard.h
@@ -50,7 +50,7 @@ class Keyboard : public SubComponent {
     
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 private:
@@ -60,7 +60,7 @@ class Keyboard : public SubComponent {
     
     
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
 
 private:
diff --git a/Emulator/Peripherals/Mouse/Mouse.cpp b/Emulator/Peripherals/Mouse/Mouse.cpp
index da9f5c0a6..62aa84bb3 100644
--- a/Emulator/Peripherals/Mouse/Mouse.cpp
+++ b/Emulator/Peripherals/Mouse/Mouse.cpp
@@ -379,6 +379,16 @@ Mouse::pressAndReleaseLeft(Cycle duration, Cycle delay)
     }
 }
 
+void
+Mouse::pressAndReleaseMiddle(Cycle duration, Cycle delay)
+{
+    if (port.isPort1()) {
+        agnus.scheduleRel <SLOT_MSE1> (delay, MSE_PUSH_MIDDLE, duration);
+    } else {
+        agnus.scheduleRel <SLOT_MSE2> (delay, MSE_PUSH_MIDDLE, duration);
+    }
+}
+
 void
 Mouse::pressAndReleaseRight(Cycle duration, Cycle delay)
 {
diff --git a/Emulator/Peripherals/Mouse/Mouse.h b/Emulator/Peripherals/Mouse/Mouse.h
index 0d0ef61e8..346491e9c 100644
--- a/Emulator/Peripherals/Mouse/Mouse.h
+++ b/Emulator/Peripherals/Mouse/Mouse.h
@@ -97,7 +97,7 @@ class Mouse : public SubComponent {
     
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 private:
@@ -107,7 +107,7 @@ class Mouse : public SubComponent {
     
     
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
 
 private:
@@ -201,8 +201,9 @@ class Mouse : public SubComponent {
     
 public:
     
-    // Simulates a complete press-and-release cycle for the left or right button
+    // Simulates a complete press-and-release cycle for a button
     void pressAndReleaseLeft(Cycle duration = SEC(0.5), Cycle delay = 0);
+    void pressAndReleaseMiddle(Cycle duration = SEC(0.5), Cycle delay = 0);
     void pressAndReleaseRight(Cycle duration = SEC(0.5), Cycle delay = 0);
 
     template <EventSlot s> void serviceMouseEvent();
diff --git a/Emulator/RetroShell/CMakeLists.txt b/Emulator/RetroShell/CMakeLists.txt
index a2b2f361c..23bca4ec7 100644
--- a/Emulator/RetroShell/CMakeLists.txt
+++ b/Emulator/RetroShell/CMakeLists.txt
@@ -5,8 +5,6 @@ Interpreter.cpp
 InterpreterCmds.cpp
 InterpreterDebugCmds.cpp
 RetroShell.cpp
-RetroShellCmds.cpp
-RetroShellDebugCmds.cpp
 TextStorage.cpp
 
 )
diff --git a/Emulator/RetroShell/Command.cpp b/Emulator/RetroShell/Command.cpp
index 01ce78dcd..0f369a4e5 100644
--- a/Emulator/RetroShell/Command.cpp
+++ b/Emulator/RetroShell/Command.cpp
@@ -10,6 +10,7 @@
 #include "config.h"
 #include "Command.h"
 #include <algorithm>
+#include <utility>
 
 namespace vamiga {
 
@@ -31,18 +32,18 @@ Command::add(const std::vector<string> &tokens,
 void
 Command::add(const std::vector<string> &tokens,
              const string &help,
-             void (RetroShell::*action)(Arguments&, long), long param)
+             std::function<void (Arguments&, long)> func, long param)
 {
-    add(tokens, { }, { }, help, action, param);
+    add(tokens, { }, { }, help, func, param);
 }
 
 void
 Command::add(const std::vector<string> &tokens,
              const std::vector<string> &arguments,
              const string &help,
-             void (RetroShell::*action)(Arguments&, long), long param)
+             std::function<void (Arguments&, long)> func, long param)
 {
-    add(tokens, arguments, { }, help, action, param);
+    add(tokens, arguments, { }, help, func, param);
 }
 
 void
@@ -50,62 +51,49 @@ Command::add(const std::vector<string> &tokens,
              const std::vector<string> &requiredArgs,
              const std::vector<string> &optionalArgs,
              const string &help,
-             void (RetroShell::*action)(Arguments&, long), long param)
+             std::function<void (Arguments&, long)> func, long param)
 {
     assert(!tokens.empty());
-    
+
     // Traverse the node tree
     Command *cmd = seek(std::vector<string> { tokens.begin(), tokens.end() - 1 });
     assert(cmd != nullptr);
 
-    // Install the action handler in the parent node if this is no sub-command
-    if (tokens.back() == "") { cmd->action = action; cmd->param = param; }
-
     // Create the instruction
     Command d;
     d.name = tokens.back();
     d.fullName = (cmd->fullName.empty() ? "" : cmd->fullName + " ") + tokens.back();
-    d.group = groups.size() - 1;
+    d.group = isize(groups.size()) - 1;
     d.requiredArgs = requiredArgs;
     d.optionalArgs = optionalArgs;
     d.help = help;
-    d.action = action;
+    d.callback = func;
     d.param = param;
+    d.hidden = help.empty() || help.at(0) == '*';
 
     // Register the instruction
     cmd->subCommands.push_back(d);
 }
 
-void
-Command::hide(const std::vector<string> &tokens)
-{
-    Command *cmd = seek(std::vector<string> { tokens.begin(), tokens.end() });
-    assert(cmd != nullptr);
-
-    cmd->hidden = true;
-}
-
-void
-Command::remove(const string& token)
+const Command *
+Command::seek(const string& token) const
 {
-    for(auto it = std::begin(subCommands); it != std::end(subCommands); ++it) {
-        if (it->name == token) { subCommands.erase(it); return; }
+    for (auto &it : subCommands) {
+        if (it.name == token) return &it;
     }
+    return nullptr;
 }
 
 Command *
 Command::seek(const string& token)
 {
-    for (auto &it : subCommands) {
-        if (it.name == token) return &it;
-    }
-    return nullptr;
+    return const_cast<Command *>(std::as_const(*this).seek(token));
 }
 
-Command *
-Command::seek(const std::vector<string> &tokens)
+const Command *
+Command::seek(const std::vector<string> &tokens) const
 {
-    Command *result = this;
+    const Command *result = this;
     
     for (auto &it : tokens) {
         if ((result = result->seek(it)) == nullptr) break;
@@ -114,6 +102,12 @@ Command::seek(const std::vector<string> &tokens)
     return result;
 }
 
+Command *
+Command::seek(const std::vector<string> &tokens)
+{
+    return const_cast<Command *>(std::as_const(*this).seek(tokens));
+}
+
 std::vector<const Command *>
 Command::filterPrefix(const string& prefix) const
 {
@@ -189,7 +183,7 @@ Command::usage() const
         if (count > 1) {
             arguments = "{" + arguments + "}";
         }
-        if (action && arguments != "") {
+        if (seek("") && arguments != "") {
             arguments = "[ " + arguments + " ]";
         }
     }
diff --git a/Emulator/RetroShell/Command.h b/Emulator/RetroShell/Command.h
index 109a7e4ba..e95c4e9fd 100644
--- a/Emulator/RetroShell/Command.h
+++ b/Emulator/RetroShell/Command.h
@@ -11,6 +11,7 @@
 
 #include "Aliases.h"
 #include <vector>
+#include <functional>
 
 namespace vamiga {
 
@@ -50,22 +51,22 @@ struct Command {
     // List of required arguments
     std::vector<string> requiredArgs;
 
-    // List of additional optional arguments
+    // List of optional arguments
     std::vector<string> optionalArgs;
 
-    // Help string
+    // Help message for this command
     string help;
     
-    // List of sub-commands
+    // List of subcommands
     std::vector<Command> subCommands;
     
     // Command handler
-    void (RetroShell::*action)(Arguments&, long) = nullptr;
+    std::function<void (Arguments&, long)> callback = nullptr;
 
-    // Additional parameter passed to the command handler
+    // Additional argument passed to the command handler
     long param = 0;
     
-    // Indicates if this command appears in the help descriptions
+    // Indicates if this command appears in help descriptions
     bool hidden = false;
 
     
@@ -82,25 +83,18 @@ struct Command {
 
     void add(const std::vector<string> &tokens,
              const string &help,
-             void (RetroShell::*action)(Arguments&, long), long param = 0);
+             std::function<void (Arguments&, long)> func, long param = 0);
 
     void add(const std::vector<string> &tokens,
              const std::vector<string> &args,
              const string &help,
-             void (RetroShell::*action)(Arguments&, long), long param = 0);
-
+             std::function<void (Arguments&, long)> func, long param = 0);
 
     void add(const std::vector<string> &tokens,
              const std::vector<string> &requiredArgs,
              const std::vector<string> &optionalArgs,
              const string &help,
-             void (RetroShell::*action)(Arguments&, long), long param = 0);
-
-    // Marks a command as hidden
-    void hide(const std::vector<string> &tokens);
-
-    // Removes a registered command
-    void remove(const string& token);
+             std::function<void (Arguments&, long)> func, long param = 0);
 
     // Returns arguments counts
     isize minArgs() const { return isize(requiredArgs.size()); }
@@ -108,10 +102,12 @@ struct Command {
     isize maxArgs() const { return minArgs() + optArgs(); }
 
     // Seeks a command object inside the command object tree
+    const Command *seek(const string& token) const;
     Command *seek(const string& token);
+    const Command *seek(const std::vector<string> &tokens) const;
     Command *seek(const std::vector<string> &tokens);
-        
-    // Filters the argument list
+
+    // Filters the argument list (used by auto-completion)
     std::vector<const Command *> filterPrefix(const string& prefix) const;
 
     // Automatically completes a partial token string
diff --git a/Emulator/RetroShell/Interpreter.cpp b/Emulator/RetroShell/Interpreter.cpp
index 276e356d1..11bdfc5c7 100644
--- a/Emulator/RetroShell/Interpreter.cpp
+++ b/Emulator/RetroShell/Interpreter.cpp
@@ -158,12 +158,13 @@ Interpreter::exec(const Arguments &argv, bool verbose)
         current = current->seek(args.front());
         args.erase(args.begin());
     }
+    if ((next = current->seek(""))) current = next;
 
     // Error out if no command handler is present
-    if (current->action == nullptr && !args.empty()) {
+    if (!current->callback && !args.empty()) {
         throw util::ParseError(args.front());
     }
-    if (current->action == nullptr && args.empty()) {
+    if (!current->callback && args.empty()) {
         throw TooFewArgumentsError(current->fullName);
     }
     
@@ -172,7 +173,7 @@ Interpreter::exec(const Arguments &argv, bool verbose)
     if ((isize)args.size() > current->maxArgs()) throw TooManyArgumentsError(current->fullName);
     
     // Call the command handler
-    (retroShell.*(current->action))(args, current->param);
+    current->callback(args, current->param);
 }
 
 void
@@ -210,8 +211,6 @@ Interpreter::help(const Arguments &argv)
 void
 Interpreter::help(const Command& current)
 {
-    // auto tokens = current.tokens();
-    // auto length = tokens.size();
     auto indent = string("    ");
 
     // Print the usage string
diff --git a/Emulator/RetroShell/Interpreter.h b/Emulator/RetroShell/Interpreter.h
index ca7d9ce6d..f6c59a0b7 100644
--- a/Emulator/RetroShell/Interpreter.h
+++ b/Emulator/RetroShell/Interpreter.h
@@ -17,33 +17,6 @@
 
 namespace vamiga {
 
-enum class Token
-{
-    about, accuracy, activation, agnus, amiga, at, attach, audiate, audio,
-    autofire, autosync, bankmap, beam, bitplanes, blitter, bp, brightness,
-    bullets, cbp, channel, checksums, chip, cia, ciaa, ciab, clear, close,
-    clxsprspr, clxsprplf, clxplfplf, color, config, connect, contrast,
-    controlport, copper, cp, cpu, cutout, cwp, dasm, dc, debug, defaults,
-    delay, del, denise, detach, device, devices, dfn, diagboard, disassemble,
-    down, disable, disconnect, disk, dma, dmadebugger, drive, dsksync,
-    easteregg, eject, enable, esync, events, execbase, extrom, extstart, fast,
-    filename, filesystem, filter, fpu, gdb, geometry, hdn, help, hide, host,
-    ignore, init, info, insert, inspect, interrupt, interrupts, joystick, jump,
-    keyboard, keyset, layers, left, library, libraries, list, load, lock,
-    mechanics, memdump, memory, mmu, mode, model, monitor, mouse, next, none,
-    opacity, open, os, overclocking, palette, pan, partition, path,
-    paula, pause, ptrdrops, poll, port, ports, power, press, process,
-    processes, pull, pullup, raminitpattern, refresh, registers, regreset,
-    regression, release, reset, resource, resources, revision, right, rom, rpm,
-    rshell, rtc, run, sampling, saturation, save, saveroms, screenshot,
-    searchpath, serial, server, set, setup, shakedetector, show, slow,
-    slowramdelay, slowrammirror, source, speed, sprites, start, status, step,
-    stop, swapdelay, swtraps, syntax, task, tasks, tod, todbug, tracking,
-    translate, trap, type, uart, unmappingtype, unpress, up, vector, vectors,
-    verbose, velocity, volume, volumes, vsync, wait, watch, watchpoint, wom,
-    wp, write, xaxis, yaxis, zorro
-};
-
 struct TooFewArgumentsError : public util::ParseError {
     using ParseError::ParseError;
 };
@@ -86,7 +59,7 @@ class Interpreter: SubComponent
 
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 private:
@@ -96,7 +69,7 @@ class Interpreter: SubComponent
 
     
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
     
 private:
@@ -133,6 +106,12 @@ class Interpreter: SubComponent
     // Auto-completes an argument list
     void autoComplete(Arguments &argv);
 
+    // Parses an argument of a certain type
+    bool parseBool(Arguments &argv, isize n = 0) { return util::parseBool(argv[n]); }
+    bool parseOnOff(Arguments &argv, isize n = 0) { return util::parseOnOff(argv[n]); }
+    long parseNum(Arguments &argv, isize n = 0) { return util::parseNum(argv[n]); }
+    template <typename T> long parseEnum(Arguments &argv, isize n = 0) { return util::parseEnum<T>(argv[n]); }
+
 
     //
     // Managing the interpreter
diff --git a/Emulator/RetroShell/InterpreterCmds.cpp b/Emulator/RetroShell/InterpreterCmds.cpp
index 81c649aab..ad3d9f7c5 100644
--- a/Emulator/RetroShell/InterpreterCmds.cpp
+++ b/Emulator/RetroShell/InterpreterCmds.cpp
@@ -9,7 +9,6 @@
 
 #include "config.h"
 #include "Interpreter.h"
-#include "RetroShell.h"
 #include "Amiga.h"
 
 namespace vamiga {
@@ -25,34 +24,60 @@ Interpreter::initCommons(Command &root)
 
     root.add({"."},
              "Enters or exists the debugger",
-             &RetroShell::exec <Token::debug>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.clear();
+        switchInterpreter();
+        retroShell.welcome();
+    });
 
     root.add({"clear"},
              "Clears the console window",
-             &RetroShell::exec <Token::clear>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.clear();
+    });
 
     root.add({"close"},
              "Hides the console window",
-             &RetroShell::exec <Token::close>);
+             [this](Arguments& argv, long value) {
+
+        msgQueue.put(MSG_CLOSE_CONSOLE);
+    });
 
     root.add({"help"}, { }, {Arg::command},
              "Prints usage information",
-             &RetroShell::exec <Token::help>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.help(argv.empty() ? "" : argv.front());
+    });
 
     root.add({"joshua"},
              "",
-             &RetroShell::exec <Token::easteregg>);
+             [this](Arguments& argv, long value) {
+
+        retroShell << "\nGREETINGS PROFESSOR HOFFMANN.\n";
+        retroShell << "THE ONLY WINNING MOVE IS NOT TO PLAY.\n";
+        retroShell << "HOW ABOUT A NICE GAME OF CHESS?\n\n";
+    });
 
     root.add({"source"}, {Arg::path},
              "Processes a command script",
-             &RetroShell::exec <Token::source>);
+             [this](Arguments& argv, long value) {
+
+        auto stream = std::ifstream(argv.front());
+        if (!stream.is_open()) throw VAError(ERROR_FILE_NOT_FOUND, argv.front());
+        retroShell.execScript(stream);
+    });
 
     root.add({"wait"}, {Arg::value, Arg::seconds},
              "Pauses the execution of a command script",
-             &RetroShell::exec <Token::wait>);
+             [this](Arguments& argv, long value) {
 
-    root.hide({"joshua"});
-    root.hide({"wait"});
+        auto seconds = parseNum(argv);
+        retroShell.wakeUp = agnus.clock + SEC(seconds);
+        throw ScriptInterruption(seconds);
+    });
 }
 
 void
@@ -67,6 +92,7 @@ Interpreter::initCommandShell(Command &root)
     root.newGroup("Regression testing");
 
     root.add({"regression"},    "Runs the regression tester");
+    root.add({"screenshot"},    "Manages screenshots");
 
     root.newGroup("Controlling components");
 
@@ -87,8 +113,8 @@ Interpreter::initCommandShell(Command &root)
 
     root.add({"monitor"},       "Amiga monitor");
     root.add({"keyboard"},      "Keyboard");
-    root.add({"mouse"},         "Mouse");
     root.add({"joystick"},      "Joystick");
+    root.add({"mouse"},         "Mouse");
     root.add({"dfn"},           "All floppy drives");
     root.add({"df0"},           "Floppy drive 0");
     root.add({"df1"},           "Floppy drive 1");
@@ -111,31 +137,55 @@ Interpreter::initCommandShell(Command &root)
 
     root.newGroup("");
 
-    root.add({"regression", "setup"}, { ConfigSchemeEnum::argList(), Arg::path }, { Arg::path },
+    root.add({"regression", "setup"}, { ConfigSchemeEnum::argList() }, { Arg::path, Arg::path },
              "Initializes the test environment",
-             &RetroShell::exec <Token::regression, Token::setup>);
+             [this](Arguments& argv, long value) {
+
+        auto scheme = parseEnum<ConfigSchemeEnum>(argv);
+        auto rom = argv.size() > 1 ? argv[1] : "";
+        auto ext = argv.size() > 2 ? argv[2] : "";
+
+        amiga.regressionTester.prepare(scheme, rom, ext);
+    });
 
     root.add({"regression", "run"}, { Arg::path },
              "Launches a regression test",
-             &RetroShell::exec <Token::regression, Token::run>);
-    
-    root.add({"screenshot"},
-             "Manages regression tests");
+             [this](Arguments& argv, long value) {
+
+        amiga.regressionTester.run(argv.front());
+    });
 
     root.add({"screenshot", "set"},
-             "Configures the regression test");
+             "Configures the screenshot");
 
     root.add({"screenshot", "set", "filename"}, { Arg::path },
              "Assigns the screen shot filename",
-             &RetroShell::exec <Token::screenshot, Token::set, Token::filename>);
+             [this](Arguments& argv, long value) {
+
+        amiga.regressionTester.dumpTexturePath = argv.front();
+    });
 
     root.add({"screenshot", "set", "cutout"}, { Arg::value, Arg::value, Arg::value, Arg::value },
              "Adjusts the texture cutout",
-             &RetroShell::exec <Token::screenshot, Token::set, Token::cutout>);
+             [this](Arguments& argv, long value) {
+
+        isize x1 = parseNum(argv, 0);
+        isize y1 = parseNum(argv, 1);
+        isize x2 = parseNum(argv, 2);
+        isize y2 = parseNum(argv, 3);
+
+        amiga.regressionTester.x1 = x1;
+        amiga.regressionTester.y1 = y1;
+        amiga.regressionTester.x2 = x2;
+        amiga.regressionTester.y2 = y2;
+    });
 
     root.add({"screenshot", "save"}, { Arg::path },
              "Saves a screenshot and exits the emulator",
-             &RetroShell::exec <Token::screenshot, Token::save>);
+             [this](Arguments& argv, long value) {
+
+        amiga.regressionTester.dumpTexture(amiga, argv.front());
+    });
 
     
     //
@@ -146,34 +196,66 @@ Interpreter::initCommandShell(Command &root)
 
     root.add({"amiga", ""},
              "Displays the current configuration",
-             &RetroShell::exec <Token::amiga, Token::config>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dumpConfig(amiga);
+    });
+
+    root.add({"amiga", "defaults"},
+             "Displays the user defaults storage",
+             [this](Arguments& argv, long value) {
+
+        retroShell.dump(amiga, Category::Defaults);
+    });
 
     root.add({"amiga", "set"},
              "Configures the component");
 
     root.add({"amiga", "set", "type"}, { VideoFormatEnum::argList() },
-             "Sets the video standard to PAL or NTSC",
-             &RetroShell::exec <Token::amiga, Token::set, Token::type>);
+             "Selects the video standard",
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_VIDEO_FORMAT, parseEnum <VideoFormatEnum> (argv));
+    });
+
+    root.add({"amiga", "set", "syncmode"}, { SyncModeEnum::argList() },
+             "Selects the synchronization mode",
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_SYNC_MODE, parseEnum <SyncModeEnum> (argv));
+    });
+
+    root.add({"amiga", "set", "fps"}, { Arg::value },
+             "Sets the frames per seconds",
+             [this](Arguments& argv, long value) {
 
-    root.add({"amiga", "set", "vsync"}, { Arg::onoff },
-             "Turns VSYNC on or off",
-             &RetroShell::exec <Token::amiga, Token::vsync>);
+        amiga.configure(OPT_PROPOSED_FPS, parseNum(argv));
+        amiga.configure(OPT_SYNC_MODE, SYNC_FIXED_FPS);
+    });
 
     root.add({"amiga", "init"}, { ConfigSchemeEnum::argList() },
              "Initializes the Amiga with a predefined scheme",
-             &RetroShell::exec <Token::amiga, Token::init>);
+             [this](Arguments& argv, long value) {
+
+        auto scheme = parseEnum <ConfigSchemeEnum> (argv);
+
+        amiga.revertToFactorySettings();
+        amiga.configure(scheme);
+    });
 
     root.add({"amiga", "power"}, { Arg::onoff },
              "Switches the Amiga on or off",
-             &RetroShell::exec <Token::amiga, Token::power>);
+             [this](Arguments& argv, long value) {
+
+        parseOnOff(argv) ? amiga.run() : amiga.powerOff();
+    });
 
     root.add({"amiga", "reset"},
              "Performs a hard reset",
-             &RetroShell::exec <Token::amiga, Token::reset>);
+             [this](Arguments& argv, long value) {
 
-    root.add({"amiga", "defaults"},
-             "Displays the user defaults storage",
-             &RetroShell::exec <Token::amiga, Token::defaults>);
+        amiga.reset(true);
+    });
 
 
     //
@@ -184,57 +266,93 @@ Interpreter::initCommandShell(Command &root)
 
     root.add({"memory", ""},
              "Displays the current configuration",
-             &RetroShell::exec <Token::memory, Token::config>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dumpConfig(amiga.mem);
+    });
 
     root.add({"memory", "set"},
              "Configures the component");
 
     root.add({"memory", "set", "chip"}, { Arg::kb },
              "Configures the amouts of chip memory",
-             &RetroShell::exec <Token::memory, Token::set, Token::chip>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_CHIP_RAM, parseNum(argv));
+    });
 
     root.add({"memory", "set", "slow"},  { Arg::kb },
              "Configures the amouts of slow memory",
-             &RetroShell::exec <Token::memory, Token::set, Token::slow>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_SLOW_RAM, parseNum(argv));
+    });
 
     root.add({"memory", "set", "fast"}, { Arg::kb },
              "Configures the amouts of flow memory",
-             &RetroShell::exec <Token::memory, Token::set, Token::fast>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_FAST_RAM, parseNum(argv));
+    });
 
     root.add({"memory", "set", "extstart"}, { Arg::address },
              "Sets the start address for Rom extensions",
-             &RetroShell::exec <Token::memory, Token::set, Token::extstart>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_EXT_START, parseNum(argv));
+    });
 
     root.add({"memory", "set", "saveroms"}, { Arg::boolean },
              "Determines whether Roms should be stored in snapshots",
-             &RetroShell::exec <Token::memory, Token::set, Token::saveroms>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_SAVE_ROMS, parseBool(argv));
+    });
 
     root.add({"memory", "set", "slowramdelay"}, { Arg::boolean },
              "Enables or disables slow Ram bus delays",
-             &RetroShell::exec <Token::memory, Token::set, Token::slowramdelay>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_SLOW_RAM_DELAY, parseBool(argv));
+    });
 
     root.add({"memory", "set", "bankmap"}, { BankMapEnum::argList() },
              "Selects the bank mapping scheme",
-             &RetroShell::exec <Token::memory, Token::set, Token::bankmap>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_BANKMAP, parseEnum <BankMapEnum> (argv));
+    });
 
     root.add({"memory", "set", "raminit"}, { RamInitPatternEnum::argList() },
              "Determines how Ram is initialized on startup",
-             &RetroShell::exec <Token::memory, Token::set, Token::raminitpattern>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_RAM_INIT_PATTERN, parseEnum <RamInitPatternEnum> (argv));
+    });
 
     root.add({"memory", "set", "unmapped"}, { UnmappedMemoryEnum::argList() },
              "Determines the behaviour of unmapped memory",
-             &RetroShell::exec <Token::memory, Token::set, Token::unmappingtype>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_UNMAPPING_TYPE, parseEnum <UnmappedMemoryEnum> (argv));
+    });
 
     root.add({"memory", "load"},
              "Installs a Rom image");
 
     root.add({"memory", "load", "rom"}, { Arg::path },
              "Installs a Kickstart Rom",
-             &RetroShell::exec <Token::memory, Token::load, Token::rom>);
+             [this](Arguments& argv, long value) {
+
+        amiga.mem.loadRom(argv.front());
+    });
 
     root.add({"memory", "load", "extrom"}, { Arg::path },
              "Installs a Rom extension",
-             &RetroShell::exec <Token::memory, Token::load, Token::extrom>);
+             [this](Arguments& argv, long value) {
+
+        amiga.mem.loadExt(argv.front());
+    });
 
     
     //
@@ -245,33 +363,51 @@ Interpreter::initCommandShell(Command &root)
 
     root.add({"cpu", ""},
              "Displays the current configuration",
-             &RetroShell::exec <Token::cpu, Token::config>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dumpConfig(amiga.cpu);
+    });
 
     root.add({"cpu", "set"},
              "Configures the component");
 
     root.add({"cpu", "set", "revision"}, { CPURevisionEnum::argList() },
              "Selects the emulated chip model",
-             &RetroShell::exec <Token::cpu, Token::set, Token::revision>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_CPU_REVISION, parseEnum <CPURevisionEnum> (argv));
+    });
 
     root.add({"cpu", "set", "dasm"},
              "Configures the disassembler");
 
     root.add({"cpu", "set", "dasm", "revision"}, { DasmRevisionEnum::argList() },
              "Selects the disassembler instruction set",
-             &RetroShell::exec <Token::cpu, Token::set, Token::dasm, Token::revision>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_CPU_DASM_REVISION, parseEnum <DasmRevisionEnum> (argv));
+    });
 
     root.add({"cpu", "set", "dasm", "syntax"}, {  DasmSyntaxEnum::argList() },
              "Selects the disassembler syntax style",
-             &RetroShell::exec <Token::cpu, Token::set, Token::dasm, Token::syntax>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_CPU_DASM_SYNTAX, parseEnum <DasmSyntaxEnum> (argv));
+    });
 
     root.add({"cpu", "set", "overclocking"}, { Arg::value },
              "Overclocks the CPU by the specified factor",
-             &RetroShell::exec <Token::cpu, Token::set, Token::overclocking>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_CPU_OVERCLOCKING, parseNum(argv));
+    });
 
     root.add({"cpu", "set", "regreset"}, { Arg::value },
              "Selects the reset value of data and address registers",
-             &RetroShell::exec <Token::cpu, Token::set, Token::regreset>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_CPU_RESET_VAL, parseNum(argv));
+    });
 
 
     //
@@ -286,22 +422,42 @@ Interpreter::initCommandShell(Command &root)
         
         root.add({cia, ""},
                  "Displays the current configuration",
-                 &RetroShell::exec <Token::cia, Token::config>, i);
-        
+                 [this](Arguments& argv, long value) {
+
+            if (value == 0) retroShell.dumpConfig(amiga.ciaA);
+            if (value == 1) retroShell.dumpConfig(amiga.ciaB);
+
+        }, i);
+
         root.add({cia, "set"},
                  "Configures the component");
         
         root.add({cia, "set", "revision"}, { CIARevisionEnum::argList() },
                  "Selects the emulated chip model",
-                 &RetroShell::exec <Token::cia, Token::set, Token::revision>, i);
-        
+                 [this](Arguments& argv, long value) {
+
+            auto parsed = parseEnum <CIARevisionEnum> (argv);
+            amiga.configure(OPT_CIA_REVISION, value, parsed);
+
+        }, i);
+
         root.add({cia, "set", "todbug"}, { Arg::boolean },
                  "Enables or disables the TOD hardware bug",
-                 &RetroShell::exec <Token::cia, Token::set, Token::todbug>, i);
-        
+                 [this](Arguments& argv, long value) {
+
+            auto parsed = parseBool(argv);
+            amiga.configure(OPT_TODBUG, value, parsed);
+
+        }, i);
+
         root.add({cia, "set", "esync"}, { Arg::boolean },
                  "Turns E-clock syncing on or off",
-                 &RetroShell::exec <Token::cia, Token::set, Token::esync>, i);
+                 [this](Arguments& argv, long value) {
+
+            auto parsed = parseBool(argv);
+            amiga.configure(OPT_ECLOCK_SYNCING, value, parsed);
+
+        }, i);
     }
     
     
@@ -313,22 +469,34 @@ Interpreter::initCommandShell(Command &root)
 
     root.add({"agnus", ""},
              "Displays the current configuration",
-             &RetroShell::exec <Token::agnus, Token::config>);
-    
+             [this](Arguments& argv, long value) {
+
+        retroShell.dumpConfig(agnus);
+    });
+
     root.add({"agnus", "set"},
              "Configures the component");
 
     root.add({"agnus", "set", "revision"}, { AgnusRevisionEnum::argList() },
              "Selects the emulated chip model",
-             &RetroShell::exec <Token::agnus, Token::set, Token::revision>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_AGNUS_REVISION, parseEnum <AgnusRevisionEnum> (argv));
+    });
 
     root.add({"agnus", "set", "slowrammirror"}, { Arg::boolean },
              "Enables or disables ECS Slow Ram mirroring",
-             &RetroShell::exec <Token::agnus, Token::set, Token::slowrammirror>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_SLOW_RAM_MIRROR, parseBool(argv));
+    });
 
     root.add({"agnus", "set", "ptrdrops"}, { Arg::boolean },
              "Emulate dropped register writes",
-             &RetroShell::exec <Token::agnus, Token::set, Token::ptrdrops>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_PTR_DROPS, parseBool(argv));
+    });
 
     
     //
@@ -339,14 +507,20 @@ Interpreter::initCommandShell(Command &root)
 
     root.add({"blitter", ""},
              "Displays the current configuration",
-             &RetroShell::exec <Token::blitter, Token::config>);
-    
+             [this](Arguments& argv, long value) {
+
+        retroShell.dumpConfig(blitter);
+    });
+
     root.add({"blitter", "set"},
              "Configures the component");
 
     root.add({"blitter", "set", "accuracy"}, { "1..3" },
              "Selects the emulation accuracy level",
-             &RetroShell::exec <Token::blitter, Token::set, Token::accuracy>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_BLITTER_ACCURACY, parseNum(argv));
+    });
 
     
     //
@@ -357,45 +531,72 @@ Interpreter::initCommandShell(Command &root)
 
     root.add({"denise", ""},
              "Displays the current configuration",
-             &RetroShell::exec <Token::denise, Token::config>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dumpConfig(amiga.denise);
+    });
 
     root.add({"denise", "set"},
              "Configures the component");
 
     root.add({"denise", "set", "revision"}, { DeniseRevisionEnum::argList() },
              "Selects the emulated chip model",
-             &RetroShell::exec <Token::denise, Token::set, Token::revision>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_DENISE_REVISION, parseEnum <DeniseRevisionEnum> (argv));
+    });
 
     root.add({"denise", "set", "tracking"}, { Arg::boolean },
              "Enables or disables viewport tracking",
-             &RetroShell::exec <Token::denise, Token::set, Token::tracking>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_VIEWPORT_TRACKING, parseBool(argv));
+    });
 
     root.add({"denise", "set", "clxsprspr"}, { Arg::boolean },
              "Switches sprite-sprite collision detection on or off",
-             &RetroShell::exec <Token::denise, Token::set, Token::clxsprspr>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_CLX_SPR_SPR, parseBool(argv));
+    });
 
     root.add({"denise", "set", "clxsprplf"}, { Arg::boolean },
              "Switches sprite-playfield collision detection on or off",
-             &RetroShell::exec <Token::denise, Token::set, Token::clxsprplf>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_CLX_SPR_PLF, parseBool(argv));
+    });
 
     root.add({"denise", "set", "clxplfplf"}, { Arg::boolean },
              "Switches playfield-playfield collision detection on or off",
-             &RetroShell::exec <Token::denise, Token::set, Token::clxplfplf>);
-    
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_CLX_PLF_PLF, parseBool(argv));
+    });
+
     root.add({"denise", "set", "hidden"},
              "Hides bitplanes, sprites, or layers");
 
     root.add({"denise", "set", "hidden", "bitplanes"}, { Arg::value },
              "Wipes out certain bitplane data",
-             &RetroShell::exec <Token::denise, Token::set, Token::hide, Token::bitplanes>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_HIDDEN_BITPLANES, parseNum(argv));
+    });
 
     root.add({"denise", "set", "hidden", "sprites"}, { Arg::value },
              "Wipes out certain sprite data",
-             &RetroShell::exec <Token::denise, Token::set, Token::hide, Token::sprites>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_HIDDEN_SPRITES, parseNum(argv));
+    });
 
     root.add({"denise", "set", "hidden", "layers"}, { Arg::value },
              "Makes certain drawing layers transparent",
-             &RetroShell::exec <Token::denise, Token::set, Token::hide, Token::layers>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_HIDDEN_LAYERS, parseNum(argv));
+    });
 
     
     //
@@ -404,43 +605,73 @@ Interpreter::initCommandShell(Command &root)
 
     root.add({"dmadebugger", "open"},
              "Opens the DMA debugger",
-             &RetroShell::exec <Token::dmadebugger, Token::open>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_DMA_DEBUG_ENABLE, true);
+    });
 
     root.add({"dmadebugger", "close"},
              "Closes the DMA debugger",
-             &RetroShell::exec <Token::dmadebugger, Token::close>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_DMA_DEBUG_ENABLE, false);
+    });
 
     root.add({"dmadebugger", "copper"}, { Arg::onoff },
              "Turns Copper DMA visualization on or off",
-             &RetroShell::exec <Token::dmadebugger, Token::copper>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_DMA_DEBUG_CHANNEL, DMA_CHANNEL_COPPER, parseBool(argv));
+    });
 
     root.add({"dmadebugger", "blitter"}, { Arg::onoff },
              "Turns Blitter DMA visualization on or off",
-             &RetroShell::exec <Token::dmadebugger, Token::blitter>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_DMA_DEBUG_CHANNEL, DMA_CHANNEL_BLITTER, parseBool(argv));
+    });
 
     root.add({"dmadebugger", "disk"}, { Arg::onoff },
              "Turns Disk DMA visualization on or off",
-             &RetroShell::exec <Token::dmadebugger, Token::disk>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_DMA_DEBUG_CHANNEL, DMA_CHANNEL_DISK, parseBool(argv));
+    });
 
     root.add({"dmadebugger", "audio"}, { Arg::onoff },
              "Turns Audio DMA visualization on or off",
-             &RetroShell::exec <Token::dmadebugger, Token::audio>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_DMA_DEBUG_CHANNEL, DMA_CHANNEL_AUDIO, parseBool(argv));
+    });
 
     root.add({"dmadebugger", "sprites"}, { Arg::onoff },
              "Turns Sprite DMA visualization on or off",
-             &RetroShell::exec <Token::dmadebugger, Token::sprites>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_DMA_DEBUG_CHANNEL, DMA_CHANNEL_SPRITE, parseBool(argv));
+    });
 
     root.add({"dmadebugger", "bitplanes"}, { Arg::onoff },
              "Turns Bitplane DMA visualization on or off",
-             &RetroShell::exec <Token::dmadebugger, Token::bitplanes>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_DMA_DEBUG_CHANNEL, DMA_CHANNEL_BITPLANE, parseBool(argv));
+    });
 
     root.add({"dmadebugger", "cpu"}, { Arg::onoff },
              "Turns CPU bus usage visualization on or off",
-             &RetroShell::exec <Token::dmadebugger, Token::cpu>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_DMA_DEBUG_CHANNEL, DMA_CHANNEL_CPU, parseBool(argv));
+    });
 
     root.add({"dmadebugger", "refresh"}, { Arg::onoff },
              "Turn memory refresh visualization on or off",
-             &RetroShell::exec <Token::dmadebugger, Token::refresh>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_DMA_DEBUG_CHANNEL, DMA_CHANNEL_REFRESH, parseBool(argv));
+    });
 
 
     //
@@ -449,26 +680,41 @@ Interpreter::initCommandShell(Command &root)
 
     root.add({"monitor", ""},
              "Displays the current configuration",
-             &RetroShell::exec <Token::monitor, Token::config>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dumpConfig(amiga.denise.pixelEngine);
+    });
 
     root.add({"monitor", "set"},
              "Configures the component");
 
     root.add({"monitor", "set", "palette"}, { PaletteEnum::argList() },
              "Selects the color palette",
-             &RetroShell::exec <Token::monitor, Token::set, Token::palette>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_PALETTE, parseEnum <PaletteEnum> (argv));
+    });
 
     root.add({"monitor", "set", "brightness"}, { Arg::value },
              "Adjusts the brightness of the Amiga texture",
-             &RetroShell::exec <Token::monitor, Token::set, Token::brightness>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_BRIGHTNESS, parseNum(argv));
+    });
 
     root.add({"monitor", "set", "contrast"}, { Arg::value },
              "Adjusts the contrast of the Amiga texture",
-             &RetroShell::exec <Token::monitor, Token::set, Token::contrast>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_CONTRAST, parseNum(argv));
+    });
 
     root.add({"monitor", "set", "saturation"}, { Arg::value },
              "Adjusts the saturation of the Amiga texture",
-             &RetroShell::exec <Token::monitor, Token::set, Token::saturation>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_SATURATION, parseNum(argv));
+    });
 
     
     //
@@ -482,75 +728,126 @@ Interpreter::initCommandShell(Command &root)
 
     root.add({"paula", "audio", ""},
              "Displays the current configuration",
-             &RetroShell::exec <Token::audio, Token::config>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dumpConfig(amiga.paula.muxer);
+    });
 
     root.add({"paula", "audio", "filter"},
              "Displays the current filter configuration",
-             &RetroShell::exec <Token::audio, Token::filter, Token::config>);
+             [this](Arguments& argv, long value) {
+
+        retroShell << '\n';
+
+        retroShell << "Left channel:" << '\n';
+        retroShell.dumpConfig(paula.muxer.filterL);
+
+        retroShell << "Right channel:" << '\n';
+        retroShell.dumpConfig(paula.muxer.filterR);
+    });
 
     root.add({"paula", "audio", "filter", "set"},
              "Configures the audio filter");
 
     root.add({"paula", "audio", "filter", "set", "type"}, { FilterTypeEnum::argList() },
              "Configures the audio filter type",
-             &RetroShell::exec <Token::audio, Token::filter, Token::set, Token::type>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_FILTER_TYPE, parseEnum <FilterTypeEnum> (argv));
+    });
 
     root.add({"paula", "audio", "filter", "set", "activation"}, { FilterActivationEnum::argList() },
              "Selects the filter activation condition",
-             &RetroShell::exec <Token::audio, Token::filter, Token::set, Token::activation>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_FILTER_ACTIVATION, parseEnum <FilterActivationEnum> (argv));
+    });
 
     root.add({"paula", "audio", "set"},
              "Configures the component");
 
     root.add({"paula", "audio", "set", "sampling"}, { SamplingMethodEnum::argList() },
              "Selects the sampling method",
-             &RetroShell::exec <Token::audio, Token::set, Token::sampling>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_SAMPLING_METHOD, parseEnum <SamplingMethodEnum> (argv));
+    });
 
     root.add({"paula", "audio", "set", "volume"},
              "Sets the volume");
 
     root.add({"paula", "audio", "set", "volume", "channel0"}, { Arg::volume },
              "Sets the volume for audio channel 0",
-             &RetroShell::exec <Token::audio, Token::set, Token::volume>, 0);
-    
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_AUDVOL, 0, parseNum(argv));
+    });
+
     root.add({"paula", "audio", "set", "volume", "channel1"}, { Arg::volume },
              "Sets the volume for audio channel 1",
-             &RetroShell::exec <Token::audio, Token::set, Token::volume>, 1);
-    
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_AUDVOL, 1, parseNum(argv));
+    });
+
     root.add({"paula", "audio", "set", "volume", "channel2"}, { Arg::volume },
              "Sets the volume for audio channel 2",
-             &RetroShell::exec <Token::audio, Token::set, Token::volume>, 2);
-    
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_AUDVOL, 2, parseNum(argv));
+    });
+
     root.add({"paula", "audio", "set", "volume", "channel3"}, { Arg::volume },
              "Sets the volume for audio channel 3",
-             &RetroShell::exec <Token::audio, Token::set, Token::volume>, 3);
-    
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_AUDVOL, 3, parseNum(argv));
+    });
+
     root.add({"paula", "audio", "set", "volume", "left"}, { Arg::volume },
              "Sets the master volume for the left speaker",
-             &RetroShell::exec <Token::audio, Token::set, Token::volume>, 4);
-    
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_AUDVOLL, parseNum(argv));
+    });
+
     root.add({"paula", "audio", "set", "volume", "right"}, { Arg::volume },
              "Sets the master volume for the right speaker",
-             &RetroShell::exec <Token::audio, Token::set, Token::volume>, 5);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_AUDVOLR, parseNum(argv));
+    });
 
     root.add({"paula", "audio", "set", "pan"},
              "Sets the pan for one of the four audio channels");
     
     root.add({"paula", "audio", "set", "pan", "channel0"}, { Arg::value },
              "Sets the pan for audio channel 0",
-             &RetroShell::exec <Token::audio, Token::set, Token::pan>, 0);
-    
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_AUDPAN, 0, parseNum(argv));
+    });
+
     root.add({"paula", "audio", "set", "pan", "channel1"}, { Arg::value },
              "Sets the pan for audio channel 1",
-             &RetroShell::exec <Token::audio, Token::set, Token::pan>, 1);
-    
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_AUDPAN, 1, parseNum(argv));
+    });
+
     root.add({"paula", "audio", "set", "pan", "channel2"}, { Arg::value },
              "Sets the pan for audio channel 2",
-             &RetroShell::exec <Token::audio, Token::set, Token::pan>, 2);
-    
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_AUDPAN, 2, parseNum(argv));
+    });
+
     root.add({"paula", "audio", "set", "pan", "channel3"}, { Arg::value },
              "Sets the pan for audio channel 3",
-             &RetroShell::exec <Token::audio, Token::set, Token::pan>, 3);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_AUDPAN, 3, parseNum(argv));
+    });
 
 
     //
@@ -562,25 +859,37 @@ Interpreter::initCommandShell(Command &root)
 
     root.add({"paula", "dc", ""},
              "Displays the current configuration",
-             &RetroShell::exec <Token::dc, Token::config>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dumpConfig(amiga.paula.diskController);
+    });
 
     root.add({"paula", "dc", "set"},
              "Configures the component");
 
     root.add({"paula", "dc", "set", "speed"}, { Arg::value },
              "Configures the data transfer speed",
-             &RetroShell::exec <Token::dc, Token::speed>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_DRIVE_SPEED, parseNum(argv));
+    });
 
     root.add({"paula", "dc", "dsksync"},
              "Secures the DSKSYNC register");
 
     root.add({"paula", "dc", "dsksync", "auto"}, { Arg::boolean },
              "Always receive a SYNC signal",
-             &RetroShell::exec <Token::dc, Token::dsksync, Token::autosync>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_AUTO_DSKSYNC, parseBool(argv));
+    });
 
     root.add({"paula", "dc", "dsksync", "lock"}, { Arg::boolean },
              "Prevents writes to DSKSYNC",
-             &RetroShell::exec <Token::dc, Token::dsksync, Token::lock>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_LOCK_DSKSYNC, parseBool(argv));
+    });
 
 
     //
@@ -591,14 +900,20 @@ Interpreter::initCommandShell(Command &root)
 
     root.add({"rtc", ""},
              "Displays the current configuration",
-             &RetroShell::exec <Token::rtc, Token::config>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dumpConfig(amiga.rtc);
+    });
 
     root.add({"rtc", "set"},
              "Configures the component");
 
     root.add({"rtc", "set", "revision"}, { RTCRevisionEnum::argList() },
              "Selects the emulated chip model",
-             &RetroShell::exec <Token::rtc, Token::set, Token::revision>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_RTC_MODEL, parseEnum <RTCRevisionEnum> (argv));
+    });
 
 
     //
@@ -609,137 +924,265 @@ Interpreter::initCommandShell(Command &root)
 
     root.add({"keyboard", ""},
              "Displays the current configuration",
-             &RetroShell::exec <Token::keyboard, Token::config>);
-    
+             [this](Arguments& argv, long value) {
+
+        retroShell.dumpConfig(amiga.keyboard);
+    });
+
     root.add({"keyboard", "set"},
              "Configures the component");
 
     root.add({"keyboard", "set", "accuracy"}, { Arg::value },
              "Determines the emulation accuracy level",
-             &RetroShell::exec <Token::keyboard, Token::set, Token::accuracy>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_ACCURATE_KEYBOARD, parseBool(argv));
+    });
 
     root.add({"keyboard", "press"}, { Arg::value },
              "Sends a keycode to the keyboard",
-             &RetroShell::exec <Token::keyboard, Token::press>);
+             [this](Arguments& argv, long value) {
 
-    
-    //
-    // Mouse
-    //
+        keyboard.autoType(KeyCode(parseNum(argv)));
+    });
 
-    root.newGroup("");
 
-    for (isize i = 1; i <= 2; i++) {
-
-        string nr = (i == 1) ? "1" : "2";
-
-        root.add({"mouse", nr},
-                 "Mouse in port " + nr);
-
-        root.add({"mouse", nr, ""},
-                 "Displays the current configuration",
-                 &RetroShell::exec <Token::mouse, Token::config>, i);
-        
-        root.add({"mouse", nr, "set"},
-                 "Configures the component");
-        
-        root.add({"mouse", nr, "set", "pullup"}, { Arg::boolean },
-                 "Enables or disables pull-up resistors",
-                 &RetroShell::exec <Token::mouse, Token::set, Token::pullup>, i);
-        
-        root.add({"mouse", nr, "set", "shakedetector"}, { Arg::boolean },
-                 "Enables or disables the shake detector",
-                 &RetroShell::exec <Token::mouse, Token::set, Token::shakedetector>, i);
-        
-        root.add({"mouse", nr, "set", "velocity"}, { Arg::value },
-                 "Sets the horizontal and vertical mouse velocity",
-                 &RetroShell::exec <Token::mouse, Token::set, Token::velocity>, i);
-        
-        root.add({"mouse", nr, "press"},
-                 "Presses a mouse button");
-
-        root.add({"mouse", nr, "press", "left"},
-                 "Presses the left mouse button",
-                 &RetroShell::exec <Token::mouse, Token::press, Token::left>, i);
-        
-        root.add({"mouse", nr, "press", "right"},
-                 "Presses the right mouse button",
-                 &RetroShell::exec <Token::mouse, Token::press, Token::right>, i);
-    }
-
-    
     //
     // Joystick
     //
 
     root.newGroup("");
 
-    for (isize i = 1; i <= 2; i++) {
+    for (isize i = ControlPort::PORT1; i <= ControlPort::PORT2; i++) {
 
-        string nr = (i == 1) ? "1" : "2";
+        string nr = (i == ControlPort::PORT1) ? "1" : "2";
 
         root.add({"joystick", nr},
                  "Joystick in port " + nr);
 
         root.add({"joystick", nr, ""},
                  "Displays the current configuration",
-                 &RetroShell::exec <Token::joystick, Token::config>, i);
-        
+                 [this](Arguments& argv, long value) {
+
+            auto &port = (value == ControlPort::PORT1) ? amiga.controlPort1 : amiga.controlPort2;
+            retroShell.dumpConfig(port.joystick);
+
+        }, i);
+
         root.add({"joystick", nr, "set"},
                  "Configures the component");
         
         root.add({"joystick", nr, "set", "autofire"}, { Arg::boolean },
                  "Enables or disables auto-fire mode",
-                 &RetroShell::exec <Token::joystick, Token::set, Token::autofire>, i);
-        
+                 [this](Arguments& argv, long value) {
+
+            auto port = (value == ControlPort::PORT1) ? ControlPort::PORT1 : ControlPort::PORT2;
+            amiga.configure(OPT_AUTOFIRE, port, parseBool(argv));
+
+        }, i);
+
         root.add({"joystick", nr, "set", "bullets"},  { Arg::value },
                  "Sets the number of bullets per auto-fire shot",
-                 &RetroShell::exec <Token::joystick, Token::set, Token::bullets>, i);
-        
-        root.add({"joystick", nr, "set", "velocity"}, { Arg::value },
+                 [this](Arguments& argv, long value) {
+
+            auto port = (value == ControlPort::PORT1) ? ControlPort::PORT1 : ControlPort::PORT2;
+            amiga.configure(OPT_AUTOFIRE_BULLETS, port, parseNum(argv));
+
+        }, i);
+
+        root.add({"joystick", nr, "set", "delay"}, { Arg::value },
                  "Configures the auto-fire delay",
-                 &RetroShell::exec <Token::joystick, Token::set, Token::delay>, i);
+                 [this](Arguments& argv, long value) {
+
+            auto port = (value == ControlPort::PORT1) ? ControlPort::PORT1 : ControlPort::PORT2;
+            amiga.configure(OPT_AUTOFIRE_DELAY, port, parseNum(argv));
+
+        }, i);
 
         root.add({"joystick", nr, "press"}, { Arg::value },
                  "Presses a joystick button",
-                 &RetroShell::exec <Token::joystick, Token::press>, i);
+                 [this](Arguments& argv, long value) {
+
+            auto &port = (value == ControlPort::PORT1) ? amiga.controlPort1 : amiga.controlPort2;
+            auto nr = parseNum(argv);
+
+            switch (nr) {
+
+                case 1: port.joystick.trigger(PRESS_FIRE); break;
+                case 2: port.joystick.trigger(PRESS_FIRE2); break;
+                case 3: port.joystick.trigger(PRESS_FIRE3); break;
+
+                default:
+                    throw VAError(ERROR_OPT_INVARG, "1...3");
+            }
+
+        }, i);
 
         root.add({"joystick", nr, "unpress"}, { Arg::value },
                  "Releases a joystick button",
-                 &RetroShell::exec <Token::joystick, Token::unpress>, i);
+                 [this](Arguments& argv, long value) {
+
+            auto &port = (value == ControlPort::PORT1) ? amiga.controlPort1 : amiga.controlPort2;
+            auto nr = parseNum(argv);
+
+            switch (nr) {
+
+                case 1: port.joystick.trigger(RELEASE_FIRE); break;
+                case 2: port.joystick.trigger(RELEASE_FIRE2); break;
+                case 3: port.joystick.trigger(RELEASE_FIRE3); break;
+
+                default:
+                    throw VAError(ERROR_OPT_INVARG, "1...3");
+            }
+
+        }, i);
 
         root.add({"joystick", nr, "pull"},
                  "Pulls the joystick");
 
         root.add({"joystick", nr, "pull", "left"},
                  "Pulls the joystick left",
-                 &RetroShell::exec <Token::joystick, Token::pull, Token::left>, i);
-        
+                 [this](Arguments& argv, long value) {
+
+            auto &port = (value == ControlPort::PORT1) ? amiga.controlPort1 : amiga.controlPort2;
+            port.joystick.trigger(PULL_LEFT);
+
+        }, i);
+
         root.add({"joystick", nr, "pull", "right"},
                  "Pulls the joystick right",
-                 &RetroShell::exec <Token::joystick, Token::pull, Token::right>, i);
+                 [this](Arguments& argv, long value) {
+
+            auto &port = (value == ControlPort::PORT1) ? amiga.controlPort1 : amiga.controlPort2;
+            port.joystick.trigger(PULL_RIGHT);
+
+        }, i);
 
         root.add({"joystick", nr, "pull", "up"},
                  "Pulls the joystick up",
-                 &RetroShell::exec <Token::joystick, Token::pull, Token::up>, i);
+                 [this](Arguments& argv, long value) {
+
+            auto &port = (value == ControlPort::PORT1) ? amiga.controlPort1 : amiga.controlPort2;
+            port.joystick.trigger(PULL_UP);
+
+        }, i);
 
         root.add({"joystick", nr, "pull", "down"},
                  "Pulls the joystick down",
-                 &RetroShell::exec <Token::joystick, Token::pull, Token::down>, i);
+                 [this](Arguments& argv, long value) {
+
+            auto &port = (value == ControlPort::PORT1) ? amiga.controlPort1 : amiga.controlPort2;
+            port.joystick.trigger(PULL_DOWN);
+
+        }, i);
 
         root.add({"joystick", nr, "release"},
                  "Release a joystick axis");
 
         root.add({"joystick", nr, "release", "x"},
                  "Releases the x-axis",
-                 &RetroShell::exec <Token::joystick, Token::release, Token::xaxis>, i);
+                 [this](Arguments& argv, long value) {
+
+            auto &port = (value == ControlPort::PORT1) ? amiga.controlPort1 : amiga.controlPort2;
+            port.joystick.trigger(RELEASE_X);
+
+        }, i);
 
         root.add({"joystick", nr, "release", "y"},
                  "Releases the y-axis",
-                 &RetroShell::exec <Token::joystick, Token::release, Token::yaxis>, i);
+                 [this](Arguments& argv, long value) {
+
+            auto &port = (value == ControlPort::PORT1) ? amiga.controlPort1 : amiga.controlPort2;
+            port.joystick.trigger(RELEASE_Y);
+
+        }, i);
     }
-    
-    
+
+
+    //
+    // Mouse
+    //
+
+    root.newGroup("");
+
+    for (isize i = ControlPort::PORT1; i <= ControlPort::PORT2; i++) {
+
+        string nr = (i == ControlPort::PORT1) ? "1" : "2";
+
+        root.add({"mouse", nr},
+                 "Mouse in port " + nr);
+
+        root.add({"mouse", nr, ""},
+                 "Displays the current configuration",
+                 [this](Arguments& argv, long value) {
+
+            auto &port = (value == ControlPort::PORT1) ? amiga.controlPort1 : amiga.controlPort2;
+            retroShell.dumpConfig(port.mouse);
+
+        }, i);
+
+        root.add({"mouse", nr, "set"},
+                 "Configures the component");
+
+        root.add({"mouse", nr, "set", "pullup"}, { Arg::boolean },
+                 "Enables or disables pull-up resistors",
+                 [this](Arguments& argv, long value) {
+
+            auto port = (value == ControlPort::PORT1) ? ControlPort::PORT1 : ControlPort::PORT2;
+            amiga.configure(OPT_PULLUP_RESISTORS, port, parseBool(argv));
+
+        }, i);
+
+        root.add({"mouse", nr, "set", "shakedetector"}, { Arg::boolean },
+                 "Enables or disables the shake detector",
+                 [this](Arguments& argv, long value) {
+
+            auto port = (value == ControlPort::PORT1) ? ControlPort::PORT1 : ControlPort::PORT2;
+            amiga.configure(OPT_SHAKE_DETECTION, port, parseBool(argv));
+
+        }, i);
+
+        root.add({"mouse", nr, "set", "velocity"}, { Arg::value },
+                 "Sets the horizontal and vertical mouse velocity",
+                 [this](Arguments& argv, long value) {
+
+            auto port = (value == ControlPort::PORT1) ? ControlPort::PORT1 : ControlPort::PORT2;
+            amiga.configure(OPT_MOUSE_VELOCITY, port, parseNum(argv));
+
+        }, i);
+
+        root.add({"mouse", nr, "press"},
+                 "Presses a mouse button");
+
+        root.add({"mouse", nr, "press", "left"},
+                 "Presses the left mouse button",
+                 [this](Arguments& argv, long value) {
+
+            auto &port = (value == ControlPort::PORT1) ? amiga.controlPort1 : amiga.controlPort2;
+            port.mouse.pressAndReleaseLeft();
+
+        }, i);
+
+        root.add({"mouse", nr, "press", "middle"},
+                 "Presses the middle mouse button",
+                 [this](Arguments& argv, long value) {
+
+            auto &port = (value == ControlPort::PORT1) ? amiga.controlPort1 : amiga.controlPort2;
+            port.mouse.pressAndReleaseMiddle();
+
+        }, i);
+
+        root.add({"mouse", nr, "press", "right"},
+                 "Presses the right mouse button",
+                 [this](Arguments& argv, long value) {
+
+            auto &port = (value == ControlPort::PORT1) ? amiga.controlPort1 : amiga.controlPort2;
+            port.mouse.pressAndReleaseRight();
+
+        }, i);
+    }
+
+
     //
     // Serial port
     //
@@ -748,14 +1191,20 @@ Interpreter::initCommandShell(Command &root)
 
     root.add({"serial", ""},
              "Displays the current configuration",
-             &RetroShell::exec <Token::serial, Token::config>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dumpConfig(amiga.serialPort);
+    });
 
     root.add({"serial", "set"},
              "Configures the component");
 
     root.add({"serial", "set", "device"}, { SerialPortDeviceEnum::argList() },
              "Connects a device",
-             &RetroShell::exec <Token::serial, Token::set, Token::device>);
+             [this](Arguments& argv, long value) {
+
+        amiga.configure(OPT_SERIAL_DEVICE, parseEnum <SerialPortDeviceEnum> (argv));
+    });
 
 
     //
@@ -764,82 +1213,191 @@ Interpreter::initCommandShell(Command &root)
 
     root.newGroup("");
 
-    for (isize i = 0; i < 4; i++) {
+    for (isize i = 0; i <= 4; i++) {
 
-        string df = "df" + std::to_string(i);
+        string df = i == 4 ? "dfn" : "df" + std::to_string(i);
 
-        root.add({df, ""},
-                 "Displays the current configuration",
-                 &RetroShell::exec <Token::dfn, Token::config>, i);
-        
-        root.add({df, "connect"},
-                 "Connects the drive",
-                 &RetroShell::exec <Token::dfn, Token::connect>, i);
-        root.seek("df0")->remove("connect");
-        
-        root.add({df, "disconnect"},
-                 "Disconnects the drive",
-                 &RetroShell::exec <Token::dfn, Token::disconnect>, i);
-        root.seek("df0")->remove("disconnect");
-        
-        root.add({df, "eject"},
-                 "Ejects a floppy disk",
-                 &RetroShell::exec <Token::dfn, Token::eject>, i);
-        
-        root.add({df, "insert"}, { Arg::path },
-                 "Inserts a floppy disk",
-                 &RetroShell::exec <Token::dfn, Token::insert>, i);
-    }
-    
-    for (isize i = 0; i < 5; i++) {
+        if (i >= 0 && i <= 3) {
 
-        string df = i < 4 ? "df" + std::to_string(i) : "dfn";
+            root.add({df, ""},
+                     "Displays the current configuration",
+                     [this](Arguments& argv, long value) {
 
-        root.add({df, "set"},
-                 "Configures the component");
-        
-        root.add({df, "set", "model"}, { FloppyDriveTypeEnum::argList() },
-                 "Selects the drive model",
-                 &RetroShell::exec <Token::dfn, Token::set, Token::model>, i);
+                retroShell.dumpConfig(*amiga.df[value]);
 
-        root.add({df, "set", "rpm"}, { "rpm" },
-                 "Sets the disk rotation speed",
-                 &RetroShell::exec <Token::dc, Token::set, Token::rpm>);
+            }, i);
 
-        root.add({df, "set", "mechanics"}, { Arg::boolean },
-                 "Enables or disables the emulation of mechanical delays",
-                 &RetroShell::exec <Token::dfn, Token::set, Token::mechanics>, i);
-        
-        root.add({df, "set", "searchpath"}, { Arg::path },
-                 "Sets the search path for media files",
-                 &RetroShell::exec <Token::dfn, Token::set, Token::searchpath>, i);
+            if (i >= 1 && i <= 3) {
 
-        root.add({df, "set", "swapdelay"}, { Arg::value },
-                 "Sets the disk change delay",
-                 &RetroShell::exec <Token::dfn, Token::set, Token::swapdelay>, i);
+                root.add({df, "connect"},
+                         "Connects the drive",
+                         [this](Arguments& argv, long value) {
 
-        root.add({df, "set", "pan"}, { Arg::value },
-                 "Sets the pan for drive sounds",
-                 &RetroShell::exec <Token::dfn, Token::set, Token::pan>, i);
-        
-        root.add({df, "audiate"},
-                 "Sets the volume of drive sounds");
-        
-        root.add({df, "audiate", "insert"}, { Arg::volume },
-                 "Makes disk insertions audible",
-                 &RetroShell::exec <Token::dfn, Token::audiate, Token::insert>, i);
-        
-        root.add({df, "audiate", "eject"}, { Arg::volume },
-                 "Makes disk ejections audible",
-                 &RetroShell::exec <Token::dfn, Token::audiate, Token::eject>, i);
-        
-        root.add({df, "audiate", "step"},  { Arg::volume },
-                 "Makes head steps audible",
-                 &RetroShell::exec <Token::dfn, Token::audiate, Token::step>, i);
-        
-        root.add({df, "audiate", "poll"},  { Arg::volume },
-                 "Makes polling clicks audible",
-                 &RetroShell::exec <Token::dfn, Token::audiate, Token::poll>, i);
+                    amiga.configure(OPT_DRIVE_CONNECT, value, true);
+
+                }, i);
+
+                root.add({df, "disconnect"},
+                         "Disconnects the drive",
+                         [this](Arguments& argv, long value) {
+
+                    amiga.configure(OPT_DRIVE_CONNECT, value, false);
+
+                }, i);
+            }
+            root.add({df, "eject"},
+                     "Ejects a floppy disk",
+                     [this](Arguments& argv, long value) {
+
+                amiga.df[value]->ejectDisk();
+
+            }, i);
+
+            root.add({df, "insert"}, { Arg::path },
+                     "Inserts a floppy disk",
+                     [this](Arguments& argv, long value) {
+                
+                auto path = argv.front();
+                amiga.df[value]->swapDisk(path);
+
+            }, i);
+
+            root.add({df, "set"},
+                     "Configures the component");
+
+            root.add({df, "set", "model"}, { FloppyDriveTypeEnum::argList() },
+                     "Selects the drive model",
+                     [this](Arguments& argv, long value) {
+
+                long model = parseEnum <FloppyDriveTypeEnum> (argv);
+
+                if (value == 0 || value > 3) amiga.configure(OPT_DRIVE_TYPE, 0, model);
+                if (value == 1 || value > 3) amiga.configure(OPT_DRIVE_TYPE, 1, model);
+                if (value == 2 || value > 3) amiga.configure(OPT_DRIVE_TYPE, 2, model);
+                if (value == 3 || value > 3) amiga.configure(OPT_DRIVE_TYPE, 3, model);
+
+            }, i);
+
+            root.add({df, "set", "rpm"}, { "rpm" },
+                     "Sets the disk rotation speed",
+                     [this](Arguments& argv, long value) {
+
+                long rpm = parseNum(argv);
+
+                if (value == 0 || value > 3) amiga.configure(OPT_DRIVE_RPM, 0, rpm);
+                if (value == 1 || value > 3) amiga.configure(OPT_DRIVE_RPM, 1, rpm);
+                if (value == 2 || value > 3) amiga.configure(OPT_DRIVE_RPM, 2, rpm);
+                if (value == 3 || value > 3) amiga.configure(OPT_DRIVE_RPM, 3, rpm);
+
+            }, i);
+
+            root.add({df, "set", "mechanics"}, { Arg::boolean },
+                     "Enables or disables the emulation of mechanical delays",
+                     [this](Arguments& argv, long value) {
+
+                auto scheme = parseEnum<DriveMechanicsEnum>(argv);
+
+                if (value == 0 || value > 3) amiga.configure(OPT_DRIVE_MECHANICS, 0, scheme);
+                if (value == 1 || value > 3) amiga.configure(OPT_DRIVE_MECHANICS, 1, scheme);
+                if (value == 2 || value > 3) amiga.configure(OPT_DRIVE_MECHANICS, 2, scheme);
+                if (value == 3 || value > 3) amiga.configure(OPT_DRIVE_MECHANICS, 3, scheme);
+
+            }, i);
+
+            root.add({df, "set", "searchpath"}, { Arg::path },
+                     "Sets the search path for media files",
+                     [this](Arguments& argv, long value) {
+
+                string path = argv.front();
+
+                if (value == 0 || value > 3) df0.setSearchPath(path);
+                if (value == 1 || value > 3) df1.setSearchPath(path);
+                if (value == 2 || value > 3) df2.setSearchPath(path);
+                if (value == 3 || value > 3) df3.setSearchPath(path);
+
+            }, i);
+
+            root.add({df, "set", "swapdelay"}, { Arg::value },
+                     "Sets the disk change delay",
+                     [this](Arguments& argv, long value) {
+
+                long delay = parseNum(argv);
+
+                if (value == 0 || value > 3) amiga.configure(OPT_DISK_SWAP_DELAY, 0, delay);
+                if (value == 1 || value > 3) amiga.configure(OPT_DISK_SWAP_DELAY, 1, delay);
+                if (value == 2 || value > 3) amiga.configure(OPT_DISK_SWAP_DELAY, 2, delay);
+                if (value == 3 || value > 3) amiga.configure(OPT_DISK_SWAP_DELAY, 3, delay);
+
+            }, i);
+
+            root.add({df, "set", "pan"}, { Arg::value },
+                     "Sets the pan for drive sounds",
+                     [this](Arguments& argv, long value) {
+
+                long pan = parseNum(argv);
+
+                if (value == 0 || value > 3) amiga.configure(OPT_DRIVE_PAN, 0, pan);
+                if (value == 1 || value > 3) amiga.configure(OPT_DRIVE_PAN, 1, pan);
+                if (value == 2 || value > 3) amiga.configure(OPT_DRIVE_PAN, 2, pan);
+                if (value == 3 || value > 3) amiga.configure(OPT_DRIVE_PAN, 3, pan);
+
+            }, i);
+
+            root.add({df, "audiate"},
+                     "Sets the volume of drive sounds");
+
+            root.add({df, "audiate", "insert"}, { Arg::volume },
+                     "Makes disk insertions audible",
+                     [this](Arguments& argv, long value) {
+
+                long volume = parseNum(argv);
+
+                if (value == 0 || value > 3) amiga.configure(OPT_INSERT_VOLUME, 0, volume);
+                if (value == 1 || value > 3) amiga.configure(OPT_INSERT_VOLUME, 1, volume);
+                if (value == 2 || value > 3) amiga.configure(OPT_INSERT_VOLUME, 2, volume);
+                if (value == 3 || value > 3) amiga.configure(OPT_INSERT_VOLUME, 3, volume);
+
+            }, i);
+
+            root.add({df, "audiate", "eject"}, { Arg::volume },
+                     "Makes disk ejections audible",
+                     [this](Arguments& argv, long value) {
+
+                long volume = parseNum(argv);
+
+                if (value == 0 || value > 3) amiga.configure(OPT_EJECT_VOLUME, 0, volume);
+                if (value == 1 || value > 3) amiga.configure(OPT_EJECT_VOLUME, 1, volume);
+                if (value == 2 || value > 3) amiga.configure(OPT_EJECT_VOLUME, 2, volume);
+                if (value == 3 || value > 3) amiga.configure(OPT_EJECT_VOLUME, 3, volume);
+
+            }, i);
+
+            root.add({df, "audiate", "step"},  { Arg::volume },
+                     "Makes head steps audible",
+                     [this](Arguments& argv, long value) {
+
+                long volume = parseNum(argv);
+
+                if (value == 0 || value > 3) amiga.configure(OPT_STEP_VOLUME, 0, volume);
+                if (value == 1 || value > 3) amiga.configure(OPT_STEP_VOLUME, 1, volume);
+                if (value == 2 || value > 3) amiga.configure(OPT_STEP_VOLUME, 2, volume);
+                if (value == 3 || value > 3) amiga.configure(OPT_STEP_VOLUME, 3, volume);
+
+            }, i);
+
+            root.add({df, "audiate", "poll"},  { Arg::volume },
+                     "Makes polling clicks audible",
+                     [this](Arguments& argv, long value) {
+
+                long volume = parseNum(argv);
+
+                if (value == 0 || value > 3) amiga.configure(OPT_POLL_VOLUME, 0, volume);
+                if (value == 1 || value > 3) amiga.configure(OPT_POLL_VOLUME, 1, volume);
+                if (value == 2 || value > 3) amiga.configure(OPT_POLL_VOLUME, 2, volume);
+                if (value == 3 || value > 3) amiga.configure(OPT_POLL_VOLUME, 3, volume);
+
+            }, i);
+        }
     }
 
 
@@ -849,41 +1407,84 @@ Interpreter::initCommandShell(Command &root)
 
     root.newGroup("");
 
-    for (isize i = 0; i < 4; i++) {
-        
-        string hd = "hd" + std::to_string(i);
+    for (isize i = 0; i <= 4; i++) {
 
-        root.add({hd, ""},
-                 "Displays the current configuration",
-                 &RetroShell::exec <Token::hdn, Token::config>, i);
-    }
-    
-    for (isize i = 0; i < 5; i++) {
+        string hd = i == 4 ? "hdn" : "hd" + std::to_string(i);
+
+        if (i != 4) {
+
+            root.add({hd, ""},
+                     "Displays the current configuration",
+                     [this](Arguments& argv, long value) {
+
+                retroShell.dumpConfig(*amiga.hd[value]);
+
+            }, i);
+
+            root.add({hd, "connect"},
+                     "Connects the hard drive",
+                     [this](Arguments& argv, long value) {
+
+                amiga.configure(OPT_HDC_CONNECT, value, true);
 
-        string hd = i < 4 ? "hd" + std::to_string(i) : "hdn";
+            }, i);
+
+            root.add({hd, "disconnect"},
+                     "Disconnects the hard drive",
+                     [this](Arguments& argv, long value) {
+
+                amiga.configure(OPT_HDC_CONNECT, value, false);
+
+            }, i);
+
+        }
 
         root.add({hd, "set"},
                  "Configures the component");
         
         root.add({hd, "set", "pan"}, { Arg::value },
                  "Sets the pan for drive sounds",
-                 &RetroShell::exec <Token::hdn, Token::set, Token::pan>, i);
-        
+                 [this](Arguments& argv, long value) {
+
+            long pan = parseNum(argv);
+
+            if (value == 0 || value > 3) amiga.configure(OPT_HDR_PAN, 0, pan);
+            if (value == 1 || value > 3) amiga.configure(OPT_HDR_PAN, 1, pan);
+            if (value == 2 || value > 3) amiga.configure(OPT_HDR_PAN, 2, pan);
+            if (value == 3 || value > 3) amiga.configure(OPT_HDR_PAN, 3, pan);
+
+        }, i);
+
         root.add({hd, "audiate"},
                  "Sets the volume of drive sounds");
 
         root.add({hd, "audiate", "step"}, { Arg::volume },
                  "Makes head steps audible",
-                 &RetroShell::exec <Token::hdn, Token::audiate, Token::step>, i);
-    }
-    
-    for (isize i = 0; i < 4; i++) {
+                 [this](Arguments& argv, long value) {
+
+            long volume = parseNum(argv);
 
-        string hd = "hd" + std::to_string(i);
+            if (value == 0 || value > 3) amiga.configure(OPT_HDR_STEP_VOLUME, 0, volume);
+            if (value == 1 || value > 3) amiga.configure(OPT_HDR_STEP_VOLUME, 1, volume);
+            if (value == 2 || value > 3) amiga.configure(OPT_HDR_STEP_VOLUME, 2, volume);
+            if (value == 3 || value > 3) amiga.configure(OPT_HDR_STEP_VOLUME, 3, volume);
 
-        root.add({hd, "set", "geometry"},  { Arg::value, Arg::value, Arg::value },
-                 "Changes the disk geometry",
-                 &RetroShell::exec <Token::hdn, Token::geometry>, i);
+        }, i);
+
+        if (i != 4) {
+
+            root.add({hd, "set", "geometry"},  { "<cylinders>", "<heads>", "<sectors>" },
+                     "Changes the disk geometry",
+                     [this](Arguments& argv, long value) {
+
+                auto c = util::parseNum(argv[0]);
+                auto h = util::parseNum(argv[1]);
+                auto s = util::parseNum(argv[2]);
+
+                amiga.hd[value]->changeGeometry(c, h, s);
+
+            }, i);
+        }
     }
 
 
@@ -895,107 +1496,147 @@ Interpreter::initCommandShell(Command &root)
 
     root.add({"server", ""},
              "Displays a server status summary",
-             &RetroShell::exec <Token::server>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dump(remoteManager, Category::Status);
+    });
 
     root.add({"server", "serial"},
              "Serial port server");
 
-    root.add({"server", "serial", "config"},
+    root.add({"server", "serial", ""},
              "Displays the current configuration",
-             &RetroShell::exec <Token::server, Token::serial, Token::config>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dump(remoteManager, Category::Config);
+    });
 
     root.add({"server", "serial", "set"},
              "Configures the component");
 
     root.add({"server", "serial", "set", "port"}, { Arg::value },
              "Assigns the port number",
-             &RetroShell::exec <Token::server, Token::serial, Token::set, Token::port>);
+             [this](Arguments& argv, long value) {
+
+        remoteManager.serServer.setConfigItem(OPT_SRV_PORT, parseNum(argv));
+    });
 
     root.add({"server", "serial", "set", "verbose"}, { Arg::boolean },
              "Switches verbose mode on or off",
-             &RetroShell::exec <Token::server, Token::serial, Token::set, Token::verbose>);
+             [this](Arguments& argv, long value) {
+
+        remoteManager.rshServer.setConfigItem(OPT_SRV_VERBOSE, parseBool(argv));
+    });
 
     root.add({"server", "serial", "inspect"},
              "Displays the internal state",
-             &RetroShell::exec <Token::server, Token::serial, Token::inspect>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dumpDebug(remoteManager.rshServer);
+    });
 
     root.add({"server", "rshell"},
              "Retro shell server");
 
     root.add({"server", "rshell", "start"},
              "Starts the retro shell server",
-             &RetroShell::exec <Token::server, Token::rshell, Token::start>);
+             [this](Arguments& argv, long value) {
+
+        remoteManager.rshServer.start();
+    });
 
     root.add({"server", "rshell", "stop"},
              "Stops the retro shell server",
-             &RetroShell::exec <Token::server, Token::rshell, Token::stop>);
+             [this](Arguments& argv, long value) {
+
+        remoteManager.rshServer.stop();
+    });
 
     root.add({"server", "rshell", "disconnect"},
              "Disconnects a client",
-             &RetroShell::exec <Token::server, Token::rshell, Token::disconnect>);
+             [this](Arguments& argv, long value) {
 
-    root.add({"server", "rshell", "config"},
+        remoteManager.rshServer.disconnect();
+    });
+
+    root.add({"server", "rshell", ""},
              "Displays the current configuration",
-             &RetroShell::exec <Token::server, Token::rshell, Token::config>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dumpConfig(remoteManager.rshServer);
+    });
 
     root.add({"server", "rshell", "set"},
              "Configures the component");
 
     root.add({"server", "rshell", "set", "port"}, { Arg::value },
              "Assigns the port number",
-             &RetroShell::exec <Token::server, Token::rshell, Token::set, Token::port>);
+             [this](Arguments& argv, long value) {
 
-    root.add({"server", "serial", "set", "verbose"}, { Arg::boolean },
+        remoteManager.rshServer.setConfigItem(OPT_SRV_PORT, parseNum(argv));
+    });
+
+    root.add({"server", "rshell", "set", "verbose"}, { Arg::boolean },
              "Switches verbose mode on or off",
-             &RetroShell::exec <Token::server, Token::rshell, Token::set, Token::verbose>);
+             [this](Arguments& argv, long value) {
+
+        remoteManager.rshServer.setConfigItem(OPT_SRV_PORT, parseBool(argv));
+    });
 
     root.add({"server", "rshell", "inspect"},
              "Displays the internal state",
-             &RetroShell::exec <Token::server, Token::rshell, Token::inspect>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dumpDebug(remoteManager.rshServer);
+    });
 
     root.add({"server", "gdb"},
              "GDB server");
 
     root.add({"server", "gdb", "attach"}, { Arg::process },
              "Attaches the GDB server to a process",
-             &RetroShell::exec <Token::server, Token::gdb, Token::attach>);
+             [this](Arguments& argv, long value) {
+
+        remoteManager.gdbServer.attach(argv.front());
+    });
 
     root.add({"server", "gdb", "detach"},
              "Detaches the GDB server from a process",
-             &RetroShell::exec <Token::server, Token::gdb, Token::detach>);
+             [this](Arguments& argv, long value) {
+
+        remoteManager.gdbServer.detach();
+    });
 
-    root.add({"server", "gdb", "config"},
+    root.add({"server", "gdb", ""},
              "Displays the current configuration",
-             &RetroShell::exec <Token::server, Token::gdb, Token::config>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dumpConfig(remoteManager.gdbServer);
+    });
 
     root.add({"server", "gdb", "set"},
              "Configures the component");
 
     root.add({"server", "gdb", "set", "port"}, { Arg::value },
              "Assigns the port number",
-             &RetroShell::exec <Token::server, Token::gdb, Token::set, Token::port>);
+             [this](Arguments& argv, long value) {
+
+        remoteManager.gdbServer.setConfigItem(OPT_SRV_PORT, parseNum(argv));
+    });
 
     root.add({"server", "gdb", "set", "verbose"}, { Arg::boolean },
              "Switches verbose mode on or off",
-             &RetroShell::exec <Token::server, Token::gdb, Token::set, Token::verbose>);
+             [this](Arguments& argv, long value) {
+
+        remoteManager.gdbServer.setConfigItem(OPT_SRV_VERBOSE, parseBool(argv));
+    });
 
     root.add({"server", "gdb", "inspect"},
              "Displays the internal state",
-             &RetroShell::exec <Token::server, Token::gdb, Token::inspect>);
-
-    // Hide some commands
-    root.hide({"regression"});
-    root.hide({"screenshot"});
-    /*
-    root.hide({"df0"});
-    root.hide({"df1"});
-    root.hide({"df2"});
-    root.hide({"df3"});
-    root.hide({"hd0"});
-    root.hide({"hd1"});
-    root.hide({"hd2"});
-    root.hide({"hd3"});
-    */
+             [this](Arguments& argv, long value) {
+
+        retroShell.dumpDebug(remoteManager.gdbServer);
+    });
 }
 
 }
diff --git a/Emulator/RetroShell/InterpreterDebugCmds.cpp b/Emulator/RetroShell/InterpreterDebugCmds.cpp
index fd8923945..b537415bf 100644
--- a/Emulator/RetroShell/InterpreterDebugCmds.cpp
+++ b/Emulator/RetroShell/InterpreterDebugCmds.cpp
@@ -9,7 +9,7 @@
 
 #include "config.h"
 #include "Interpreter.h"
-#include "RetroShell.h"
+#include "Amiga.h"
 
 namespace vamiga {
 
@@ -26,27 +26,50 @@ Interpreter::initDebugShell(Command &root)
 
     root.add({"pause"},
              "Pauses emulation",
-             &RetroShell::exec <Token::pause>);
+             [this](Arguments& argv, long value) {
 
-    root.add({"run"},
+        amiga.pause();
+    });
+
+    root.add({"continue"},
              "Continues emulation",
-             &RetroShell::exec <Token::run>);
+                [this](Arguments& argv, long value) {
+
+        amiga.run();
+    });
 
     root.add({"step"},
              "Steps into the next instruction",
-             &RetroShell::exec <Token::step>);
+                [this](Arguments& argv, long value) {
+
+        amiga.stepInto();
+    });
 
     root.add({"next"},
              "Steps over the next instruction",
-             &RetroShell::exec <Token::next>);
+                [this](Arguments& argv, long value) {
+
+        amiga.stepOver();
+    });
 
     root.add({"goto"}, { Arg::address },
              "Redirects the program counter",
-             &RetroShell::exec <Token::jump>);
+             [this](Arguments& argv, long value) {
+
+        amiga.cpu.jump((u32)parseNum(argv));
+    });
 
-    root.add({"disassemble"}, { Arg::address },
+    root.add({"disassemble"}, { }, { Arg::address },
              "Runs disassembler",
-             &RetroShell::exec <Token::disassemble>);
+             [this](Arguments& argv, long value) {
+
+        std::stringstream ss;
+
+        auto addr = argv.empty() ? cpu.getPC0() : u32(parseNum(argv));
+        cpu.disassembleRange(ss, addr, 16);
+
+        retroShell << '\n' << ss << '\n';
+    });
 
 
     root.newGroup("Guarding the program execution");
@@ -101,28 +124,47 @@ Interpreter::initDebugShell(Command &root)
 
     root.add({"break", ""},
              "Lists all breakpoints",
-             &RetroShell::exec <Token::bp>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dump(amiga.cpu, Category::Breakpoints);
+    });
 
     root.add({"break", "at"}, { Arg::address },
              "Sets a breakpoint at the specified address",
-             &RetroShell::exec <Token::bp, Token::at>);
+             [this](Arguments& argv, long value) {
+
+        cpu.setBreakpoint(u32(parseNum(argv)));
+    });
 
     root.add({"break", "delete"}, { Arg::address },
              "Deletes a breakpoint",
-             &RetroShell::exec <Token::bp, Token::del>);
+             [this](Arguments& argv, long value) {
+
+        cpu.deleteBreakpoint(parseNum(argv));
+    });
 
     root.add({"break", "enable"}, { Arg::address },
              "Enables a breakpoint",
-             &RetroShell::exec <Token::bp, Token::enable>);
+             [this](Arguments& argv, long value) {
+
+        cpu.enableBreakpoint(parseNum(argv));
+    });
 
     root.add({"break", "disable"}, { Arg::address },
              "Disables a breakpoint",
-             &RetroShell::exec <Token::bp, Token::disable>);
+             [this](Arguments& argv, long value) {
+
+        cpu.disableBreakpoint(parseNum(argv));
+    });
 
     root.add({"break", "ignore"}, { Arg::address, Arg::value },
              "Ignores a breakpoint a certain number of times",
-             &RetroShell::exec <Token::bp, Token::ignore>);
+             [this](Arguments& argv, long value) {
 
+        cpu.ignoreBreakpoint(util::parseNum(argv[0]), util::parseNum(argv[1]));
+    });
+
+    
     //
     // Watchpoints
     //
@@ -131,27 +173,46 @@ Interpreter::initDebugShell(Command &root)
 
     root.add({"watch", ""},
              "Lists all watchpoints",
-             &RetroShell::exec <Token::wp>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dump(amiga.cpu, Category::Watchpoints);
+    });
 
     root.add({"watch", "at"}, { Arg::address },
              "Sets a watchpoint at the specified address",
-             &RetroShell::exec <Token::wp, Token::at>);
+             [this](Arguments& argv, long value) {
+
+        cpu.setWatchpoint(u32(parseNum(argv)));
+    });
 
     root.add({"watch", "delete"}, { Arg::address },
              "Deletes a watchpoint",
-             &RetroShell::exec <Token::wp, Token::del>);
+             [this](Arguments& argv, long value) {
+
+        cpu.deleteWatchpoint(parseNum(argv));
+    });
 
     root.add({"watch", "enable"}, { Arg::address },
              "Enables a watchpoint",
-             &RetroShell::exec <Token::wp, Token::enable>);
+             [this](Arguments& argv, long value) {
+
+        cpu.enableWatchpoint(parseNum(argv));
+    });
 
     root.add({"watch", "disable"}, { Arg::address },
              "Disables a watchpoint",
-             &RetroShell::exec <Token::wp, Token::disable>);
+             [this](Arguments& argv, long value) {
+
+        cpu.disableWatchpoint(parseNum(argv));
+    });
 
     root.add({"watch", "ignore"}, { Arg::address, Arg::value },
              "Ignores a watchpoint a certain number of times",
-             &RetroShell::exec <Token::wp, Token::ignore>);
+             [this](Arguments& argv, long value) {
+
+        cpu.ignoreWatchpoint(util::parseNum(argv[0]), util::parseNum(argv[1]));
+    });
+
 
     //
     // Catchpoints
@@ -161,35 +222,65 @@ Interpreter::initDebugShell(Command &root)
 
     root.add({"catch", ""},
              "Lists all catchpoints",
-             &RetroShell::exec <Token::cp>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dump(amiga.cpu, Category::Catchpoints);
+    });
 
     root.add({"catch", "vector"}, { Arg::value },
              "Catches an exception vector",
-             &RetroShell::exec <Token::cp, Token::vector>);
+             [this](Arguments& argv, long value) {
+
+        auto nr = parseNum(argv);
+        if (nr < 0 || nr > 255) throw VAError(ERROR_OPT_INVARG, "0...255");
+        cpu.setCatchpoint(u8(nr));
+    });
 
     root.add({"catch", "interrupt"}, { Arg::value },
              "Catches an interrupt",
-             &RetroShell::exec <Token::cp, Token::interrupt>);
+             [this](Arguments& argv, long value) {
+
+        auto nr = parseNum(argv);
+        if (nr < 1 || nr > 7) throw VAError(ERROR_OPT_INVARG, "1...7");
+        cpu.setCatchpoint(u8(nr + 24));
+    });
 
     root.add({"catch", "trap"}, { Arg::value },
              "Catches a trap instruction",
-             &RetroShell::exec <Token::cp, Token::trap>);
+             [this](Arguments& argv, long value) {
+
+        auto nr = parseNum(argv);
+        if (nr < 0 || nr > 15) throw VAError(ERROR_OPT_INVARG, "0...15");
+        cpu.setCatchpoint(u8(nr + 32));
+    });
 
     root.add({"catch", "delete"}, { Arg::value },
              "Deletes a catchpoint",
-             &RetroShell::exec <Token::cp, Token::del>);
+             [this](Arguments& argv, long value) {
+
+        cpu.deleteCatchpoint(parseNum(argv));
+    });
 
     root.add({"catch", "enable"}, { Arg::value },
              "Enables a catchpoint",
-             &RetroShell::exec <Token::cp, Token::enable>);
+             [this](Arguments& argv, long value) {
+
+        cpu.enableCatchpoint(parseNum(argv));
+    });
 
     root.add({"catch", "disable"}, { Arg::value },
              "Disables a catchpoint",
-             &RetroShell::exec <Token::cp, Token::disable>);
+             [this](Arguments& argv, long value) {
+
+        cpu.disableCatchpoint(parseNum(argv));
+    });
 
     root.add({"catch", "ignore"}, { Arg::value, Arg::value },
              "Ignores a catchpoint a certain number of times",
-             &RetroShell::exec <Token::cp, Token::ignore>);
+             [this](Arguments& argv, long value) {
+
+        cpu.ignoreCatchpoint(util::parseNum(argv[0]), util::parseNum(argv[1]));
+    });
 
 
     //
@@ -198,27 +289,45 @@ Interpreter::initDebugShell(Command &root)
 
     root.add({"cbreak", ""},
              "Lists all breakpoints",
-             &RetroShell::exec <Token::cbp>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dump(copper.debugger, Category::Breakpoints);
+    });
 
     root.add({"cbreak", "at"}, { Arg::value },
              "Sets a breakpoint at the specified address",
-             &RetroShell::exec <Token::cbp, Token::at>);
+             [this](Arguments& argv, long value) {
+
+        copper.debugger.setBreakpoint(u32(parseNum(argv)));
+    });
 
     root.add({"cbreak", "delete"}, { Arg::value },
              "Deletes a breakpoint",
-             &RetroShell::exec <Token::cbp, Token::del>);
+             [this](Arguments& argv, long value) {
+
+        copper.debugger.deleteBreakpoint(parseNum(argv));
+    });
 
     root.add({"cbreak", "enable"}, { Arg::value },
              "Enables a breakpoint",
-             &RetroShell::exec <Token::cbp, Token::enable>);
+             [this](Arguments& argv, long value) {
+
+        copper.debugger.enableBreakpoint(parseNum(argv));
+    });
 
     root.add({"cbreak", "disable"}, { Arg::value },
              "Disables a breakpoint",
-             &RetroShell::exec <Token::cbp, Token::disable>);
+             [this](Arguments& argv, long value) {
+
+        copper.debugger.disableBreakpoint(parseNum(argv));
+    });
 
     root.add({"cbreak", "ignore"}, { Arg::value, Arg::value },
              "Ignores a breakpoint a certain number of times",
-             &RetroShell::exec <Token::cbp, Token::ignore>);
+             [this](Arguments& argv, long value) {
+
+        copper.debugger.ignoreBreakpoint(util::parseNum(argv[0]), util::parseNum(argv[1]));
+    });
 
 
     //
@@ -227,27 +336,45 @@ Interpreter::initDebugShell(Command &root)
 
     root.add({"cwatch", ""},
              "Lists all watchpoints",
-             &RetroShell::exec <Token::cwp>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dump(copper.debugger, Category::Watchpoints);
+    });
 
     root.add({"cwatch", "at"}, { Arg::value },
              "Sets a watchpoint at the specified address",
-             &RetroShell::exec <Token::cwp, Token::at>);
+             [this](Arguments& argv, long value) {
+
+        copper.debugger.setWatchpoint(u32(parseNum(argv)));
+    });
 
     root.add({"cwatch", "delete"}, { Arg::value },
              "Deletes a watchpoint",
-             &RetroShell::exec <Token::cwp, Token::del>);
+             [this](Arguments& argv, long value) {
+
+        copper.debugger.deleteWatchpoint(parseNum(argv));
+    });
 
     root.add({"cwatch", "enable"}, { Arg::value },
              "Enables a watchpoint",
-             &RetroShell::exec <Token::cwp, Token::enable>);
+             [this](Arguments& argv, long value) {
+
+        copper.debugger.enableWatchpoint(parseNum(argv));
+    });
 
     root.add({"cwatch", "disable"}, { Arg::value },
              "Disables a watchpoint",
-             &RetroShell::exec <Token::cwp, Token::disable>);
+             [this](Arguments& argv, long value) {
+
+        copper.debugger.disableWatchpoint(parseNum(argv));
+    });
 
     root.add({"cwatch", "ignore"}, { Arg::value, Arg::value },
              "Ignores a watchpoint a certain number of times",
-             &RetroShell::exec <Token::cwp, Token::ignore>);
+             [this](Arguments& argv, long value) {
+
+        copper.debugger.ignoreWatchpoint(util::parseNum(argv[0]), util::parseNum(argv[1]));
+    });
 
 
     //
@@ -258,15 +385,31 @@ Interpreter::initDebugShell(Command &root)
 
     root.add({"amiga", ""},
              "Inspects the internal state",
-             &RetroShell::exec <Token::amiga>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dump(amiga, Category::Inspection);
+    });
+
+    root.add({"amiga", "progress"},
+             "Displays clocks and the frame counter",
+             [this](Arguments& argv, long value) {
+
+        retroShell.dump(amiga, Category::Progress);
+    });
 
     root.add({"amiga", "host"},
              "Displays information about the host machine",
-             &RetroShell::exec <Token::amiga, Token::host>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dump(host, Category::Inspection);
+    });
 
     root.add({"amiga", "debug"},
              "Displays additional debug information",
-             &RetroShell::exec <Token::amiga, Token::debug>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dump(amiga, Category::Debug);
+    });
 
 
     //
@@ -275,19 +418,42 @@ Interpreter::initDebugShell(Command &root)
 
     root.add({"memory", ""},
              "Inspects the internal state",
-             &RetroShell::exec <Token::memory>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dump(mem, Category::BankMap);
+    });
 
     root.add({"memory", "dump"}, { Arg::address },
              "Generates a memory hexdump",
-             &RetroShell::exec <Token::memory, Token::memdump>);
+             [this](Arguments& argv, long value) {
+
+        std::stringstream ss;
+        mem.memDump<ACCESSOR_CPU>(ss, u32(parseNum(argv)));
+        retroShell << '\n' << ss << '\n';
+    });
 
     root.add({"memory", "banks"},
              "Dumps the memory bank map",
-             &RetroShell::exec <Token::memory, Token::bankmap>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dump(amiga, Category::BankMap);
+    });
 
     root.add({"memory", "checksum"},
              "Computes memory checksums",
-             &RetroShell::exec <Token::memory, Token::checksums>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dump(amiga.mem, Category::Checksums);
+    });
+
+    root.add({"memory", "write"}, { Arg::value, Arg::value },
+             "Writes a word into memory",
+             [this](Arguments& argv, long value) {
+
+        auto addr = (u32)util::parseNum(argv[0]);
+        auto val = (u16)util::parseNum(argv[1]);
+        mem.patch(addr, val);
+    });
 
 
     //
@@ -296,15 +462,24 @@ Interpreter::initDebugShell(Command &root)
 
     root.add({"cpu", ""},
              "Inspects the internal state",
-             &RetroShell::exec <Token::cpu>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dumpInspection(cpu);
+    });
 
     root.add({"cpu", "debug"},
              "Displays additional debug information",
-             &RetroShell::exec <Token::cpu, Token::debug>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dumpDebug(cpu);
+    });
 
     root.add({"cpu", "vectors"},
              "Dumps the vector table",
-             &RetroShell::exec <Token::cpu, Token::vectors>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dump(cpu, Category::Vectors);
+    });
 
 
     //
@@ -317,15 +492,24 @@ Interpreter::initDebugShell(Command &root)
 
         root.add({cia, ""},
                  "Inspects the internal state",
-                 &RetroShell::exec <Token::cia>, i);
+                 [this](Arguments& argv, long value) {
+
+            value == 0 ? retroShell.dumpInspection(ciaa) : retroShell.dumpInspection(ciab);
+        }, i);
 
         root.add({cia, "debug"},
                  "Displays additional debug information",
-                 &RetroShell::exec <Token::cia, Token::debug>, i);
+                 [this](Arguments& argv, long value) {
+
+            value == 0 ? retroShell.dumpDebug(ciaa) : retroShell.dumpDebug(ciab);
+        }, i);
 
         root.add({cia, "tod"},
                  "Displays the state of the 24-bit counter",
-                 &RetroShell::exec <Token::cia, Token::tod>, i);
+                 [this](Arguments& argv, long value) {
+
+            value == 0 ? retroShell.dump(ciaa, Category::Tod) : retroShell.dump(ciab, Category::Tod);
+        }, i);
     }
 
 
@@ -335,23 +519,38 @@ Interpreter::initDebugShell(Command &root)
 
     root.add({"agnus", ""},
              "Inspects the internal state",
-             &RetroShell::exec <Token::agnus>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dumpInspection(agnus);
+    });
 
     root.add({"agnus", "debug"},
              "Displays additional debug information",
-             &RetroShell::exec <Token::agnus, Token::debug>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dumpDebug(agnus);
+    });
 
     root.add({"agnus", "beam"},
              "Displays the current beam position",
-             &RetroShell::exec <Token::agnus, Token::beam>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dump(amiga.agnus, Category::Beam);
+    });
 
     root.add({"agnus", "dma"},
              "Prints all scheduled DMA events",
-             &RetroShell::exec <Token::agnus, Token::dma>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dump(amiga.agnus, Category::Dma);
+    });
 
     root.add({"agnus", "events"},
              "Inspects the event scheduler",
-             &RetroShell::exec <Token::agnus, Token::events>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dump(amiga.agnus, Category::Events);
+    });
 
 
     //
@@ -360,11 +559,17 @@ Interpreter::initDebugShell(Command &root)
 
     root.add({"blitter", ""},
              "Inspects the internal state",
-             &RetroShell::exec <Token::blitter>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dumpInspection(amiga.agnus.blitter);
+    });
 
     root.add({"blitter", "debug"},
              "Displays additional debug information",
-             &RetroShell::exec <Token::blitter, Token::debug>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dumpDebug(amiga.agnus.blitter);
+    });
 
 
     //
@@ -373,15 +578,33 @@ Interpreter::initDebugShell(Command &root)
 
     root.add({"copper", ""},
              "Inspects the internal state",
-             &RetroShell::exec <Token::copper>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dumpInspection(amiga.agnus.copper);
+    });
 
     root.add({"copper", "debug"},
              "Displays additional debug information",
-             &RetroShell::exec <Token::copper, Token::debug>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dumpDebug(amiga.agnus.copper);
+    });
 
     root.add({"copper", "list"}, { Arg::value },
              "Prints the Copper list",
-             &RetroShell::exec <Token::copper, Token::list>);
+             [this](Arguments& argv, long value) {
+
+        auto nr = parseNum(argv);
+
+        switch (nr) {
+
+            case 1: retroShell.dump(amiga.agnus.copper, Category::List1); break;
+            case 2: retroShell.dump(amiga.agnus.copper, Category::List2); break;
+
+            default:
+                throw VAError(ERROR_OPT_INVARG, "1 or 2");
+        }
+    });
 
 
     //
@@ -390,7 +613,17 @@ Interpreter::initDebugShell(Command &root)
 
     root.add({"paula", ""},
              "Inspects the internal state",
-             &RetroShell::exec <Token::paula>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dumpInspection(paula);
+    });
+
+    root.add({"paula", "debug"},
+             "Inspects the internal state",
+             [this](Arguments& argv, long value) {
+
+        retroShell.dumpDebug(paula);
+    });
 
     root.add({"paula", "audio"},
              "Audio unit");
@@ -403,23 +636,38 @@ Interpreter::initDebugShell(Command &root)
 
     root.add({"paula", "audio", ""},
              "Inspects the internal state",
-             &RetroShell::exec <Token::paula, Token::audio>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dumpInspection(amiga.paula.muxer);
+    });
 
     root.add({"paula", "audio", "debug"},
              "Displays additional debug information",
-             &RetroShell::exec <Token::paula, Token::audio, Token::debug>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dumpDebug(amiga.paula.muxer);
+    });
 
     root.add({"paula", "dc", ""},
              "Inspects the internal state",
-             &RetroShell::exec <Token::paula, Token::dc>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dumpInspection(amiga.paula.diskController);
+    });
 
     root.add({"paula", "dc", "debug"},
              "Displays additional debug information",
-             &RetroShell::exec <Token::paula, Token::dc, Token::debug>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dumpDebug(amiga.paula.diskController);
+    });
 
     root.add({"paula", "uart", ""},
              "Inspects the internal state",
-             &RetroShell::exec <Token::paula, Token::uart>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dumpInspection(amiga.paula.uart);
+    });
 
 
     //
@@ -428,12 +676,17 @@ Interpreter::initDebugShell(Command &root)
 
     root.add({"denise", ""},
              "Inspects the internal state",
-             &RetroShell::exec <Token::denise>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dumpInspection(denise);
+    });
 
     root.add({"denise", "debug"},
              "Displays additional debug information",
-             &RetroShell::exec <Token::denise, Token::debug>);
+             [this](Arguments& argv, long value) {
 
+        retroShell.dumpDebug(denise);
+    });
 
 
     //
@@ -442,11 +695,17 @@ Interpreter::initDebugShell(Command &root)
 
     root.add({"rtc", ""},
              "Inspects the internal state",
-             &RetroShell::exec <Token::rtc>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dumpInspection(rtc);
+    });
 
     root.add({"rtc", "debug"},
              "Displays additional debug information",
-             &RetroShell::exec <Token::rtc, Token::debug>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dumpDebug(rtc);
+    });
 
 
     //
@@ -455,11 +714,24 @@ Interpreter::initDebugShell(Command &root)
 
     root.add({"zorro", ""},
              "Lists all connected boards",
-             &RetroShell::exec <Token::zorro, Token::list>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dumpDebug(zorro);
+    });
 
     root.add({"zorro", "inspect"}, { Arg::value },
              "Inspects a specific Zorro board",
-             &RetroShell::exec <Token::zorro, Token::inspect>);
+             [this](Arguments& argv, long value) {
+
+        auto nr = parseNum(argv);
+
+        if (auto board = zorro.getBoard(nr); board != nullptr) {
+
+            retroShell.dump(*board, Category::Properties);
+            retroShell.dumpDebug(*board);
+            retroShell.dump(*board, Category::Stats);
+        }
+    });
 
 
     //
@@ -475,11 +747,21 @@ Interpreter::initDebugShell(Command &root)
 
         root.add({"controlport", nr, ""},
                  "Inspects the internal state",
-                 &RetroShell::exec <Token::controlport>, i);
+                 [this](Arguments& argv, long value) {
+
+            if (value == 1) retroShell.dumpInspection(controlPort1);
+            if (value == 2) retroShell.dumpInspection(controlPort2);
+
+        }, i);
 
         root.add({"controlport", nr, "debug"},
                  "Displays additional debug information",
-                 &RetroShell::exec <Token::controlport, Token::debug>, i);
+                 [this](Arguments& argv, long value) {
+
+            if (value == 1) retroShell.dumpDebug(controlPort1);
+            if (value == 2) retroShell.dumpDebug(controlPort2);
+
+        }, i);
     }
 
 
@@ -489,7 +771,10 @@ Interpreter::initDebugShell(Command &root)
 
     root.add({"serial", ""},
              "Displays the internal state",
-             &RetroShell::exec <Token::serial>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dumpInspection(serialPort);
+    });
 
 
     //
@@ -498,7 +783,10 @@ Interpreter::initDebugShell(Command &root)
 
     root.add({"keyboard", ""},
              "Inspects the internal state",
-             &RetroShell::exec <Token::keyboard>);
+             [this](Arguments& argv, long value) {
+
+        retroShell.dumpInspection(keyboard);
+    });
 
     for (isize i = 1; i <= 2; i++) {
 
@@ -509,18 +797,33 @@ Interpreter::initDebugShell(Command &root)
 
         root.add({"mouse", nr, ""},
                  "Inspects the internal state",
-                 &RetroShell::exec <Token::mouse>, i);
+                 [this](Arguments& argv, long value) {
+
+            if (value == 1) retroShell.dumpInspection(controlPort1.mouse);
+            if (value == 2) retroShell.dumpInspection(controlPort2.mouse);
+
+        }, i);
 
         root.add({"mouse", nr, "debug"},
                  "Displays additional debug information",
-                 &RetroShell::exec <Token::mouse, Token::debug>, i);
+                 [this](Arguments& argv, long value) {
+
+            if (value == 1) retroShell.dumpDebug(controlPort1.mouse);
+            if (value == 2) retroShell.dumpDebug(controlPort2.mouse);
+
+        }, i);
 
         root.add({"joystick", nr},
                  "Joystick in port " + nr);
 
         root.add({"joystick", nr, ""},
                  "Inspects the internal state",
-                 &RetroShell::exec <Token::joystick>, i);
+                 [this](Arguments& argv, long value) {
+
+            if (value == 1) retroShell.dumpInspection(controlPort1.joystick);
+            if (value == 2) retroShell.dumpInspection(controlPort2.joystick);
+
+        }, i);
     }
 
     //
@@ -533,15 +836,27 @@ Interpreter::initDebugShell(Command &root)
 
         root.add({df, ""},
                  "Inspects the internal state",
-                 &RetroShell::exec <Token::dfn>, i);
+                 [this](Arguments& argv, long value) {
+
+            retroShell.dumpInspection(*amiga.df[value]);
+
+        }, i);
 
         root.add({df, "debug"},
                  "Displays additional debug information",
-                 &RetroShell::exec <Token::dfn, Token::debug>, i);
+                 [this](Arguments& argv, long value) {
+
+            retroShell.dumpDebug(*amiga.df[value]);
+
+        }, i);
 
         root.add({df, "disk"},
                  "Inspects the inserted disk",
-                 &RetroShell::exec <Token::dfn, Token::disk>, i);
+                 [this](Arguments& argv, long value) {
+
+            retroShell.dump(*amiga.df[value], Category::Disk);
+
+        }, i);
     }
 
     //
@@ -557,19 +872,35 @@ Interpreter::initDebugShell(Command &root)
 
         root.add({hd, "drive"},
                  "Displays hard drive parameters",
-                 &RetroShell::exec <Token::hdn, Token::drive>, i);
+                 [this](Arguments& argv, long value) {
+
+            retroShell.dump(*amiga.df[value], Category::Drive);
+
+        }, i);
 
         root.add({hd, "volumes"},
                  "Displays summarized volume information",
-                 &RetroShell::exec <Token::hdn, Token::volumes>, i);
+                 [this](Arguments& argv, long value) {
+
+            retroShell.dump(*amiga.df[value], Category::Volumes);
+
+        }, i);
 
         root.add({hd, "partitions"},
                  "Displays information about all partitions",
-                 &RetroShell::exec <Token::hdn, Token::partition>, i);
+                 [this](Arguments& argv, long value) {
+
+            retroShell.dump(*amiga.df[value], Category::Partitions);
+
+        }, i);
 
         root.add({hd, "debug"},
                  "Displays the internal state",
-                 &RetroShell::exec <Token::hdn, Token::debug>, i);
+                 [this](Arguments& argv, long value) {
+
+            retroShell.dumpDebug(*amiga.hd[value]);
+
+        }, i);
     }
 
 
@@ -579,46 +910,138 @@ Interpreter::initDebugShell(Command &root)
 
     root.add({"os", "info"},
              "Displays basic system information",
-             &RetroShell::exec <Token::os, Token::info>);
+             [this](Arguments& argv, long value) {
+
+        std::stringstream ss;
+        osDebugger.dumpInfo(ss);
+        retroShell << ss;
+    });
 
     root.add({"os", "execbase"},
              "Displays information about the ExecBase struct",
-             &RetroShell::exec <Token::os, Token::execbase>);
+             [this](Arguments& argv, long value) {
+
+        std::stringstream ss;
+        osDebugger.dumpExecBase(ss);
+        retroShell << ss;
+    });
 
     root.add({"os", "interrupts"},
              "Lists all interrupt handlers",
-             &RetroShell::exec <Token::os, Token::interrupts>);
+             [this](Arguments& argv, long value) {
+
+        std::stringstream ss;
+        osDebugger.dumpIntVectors(ss);
+        retroShell << ss;
+    });
 
     root.add({"os", "libraries"}, { }, {"<library>"},
              "Lists all libraries",
-             &RetroShell::exec <Token::os, Token::libraries>);
+             [this](Arguments& argv, long value) {
+
+        std::stringstream ss;
+        isize num;
+
+        if (argv.empty()) {
+            osDebugger.dumpLibraries(ss);
+        } else if (util::parseHex(argv.front(), &num)) {
+            osDebugger.dumpLibrary(ss, (u32)num);
+        } else {
+            osDebugger.dumpLibrary(ss, argv.front());
+        }
+
+        retroShell << ss;
+    });
 
     root.add({"os", "devices"}, { }, {"<device>"},
              "Lists all devices",
-             &RetroShell::exec <Token::os, Token::devices>);
+             [this](Arguments& argv, long value) {
+
+        std::stringstream ss;
+        isize num;
+
+        if (argv.empty()) {
+            osDebugger.dumpDevices(ss);
+        } else if (util::parseHex(argv.front(), &num)) {
+            osDebugger.dumpDevice(ss, (u32)num);
+        } else {
+            osDebugger.dumpDevice(ss, argv.front());
+        }
+
+        retroShell << ss;
+    });
 
     root.add({"os", "resources"}, { }, {"<resource>"},
              "Lists all resources",
-             &RetroShell::exec <Token::os, Token::resources>);
+             [this](Arguments& argv, long value) {
+
+        std::stringstream ss;
+        isize num;
+
+        if (argv.empty()) {
+            osDebugger.dumpResources(ss);
+        } else if (util::parseHex(argv.front(), &num)) {
+            osDebugger.dumpResource(ss, (u32)num);
+        } else {
+            osDebugger.dumpResource(ss, argv.front());
+        }
+
+        retroShell << ss;
+    });
 
     root.add({"os", "tasks"}, { }, {"<task>"},
              "Lists all tasks",
-             &RetroShell::exec <Token::os, Token::tasks>);
+             [this](Arguments& argv, long value) {
+
+        std::stringstream ss;
+        isize num;
+
+        if (argv.empty()) {
+            osDebugger.dumpTasks(ss);
+        } else if (util::parseHex(argv.front(), &num)) {
+            osDebugger.dumpTask(ss, (u32)num);
+        } else {
+            osDebugger.dumpTask(ss, argv.front());
+        }
+
+        retroShell << ss;
+    });
 
     root.add({"os", "processes"}, { }, {"<process>"},
              "Lists all processes",
-             &RetroShell::exec <Token::os, Token::processes>);
+             [this](Arguments& argv, long value) {
+
+        std::stringstream ss;
+        isize num;
+
+        if (argv.empty()) {
+            osDebugger.dumpProcesses(ss);
+        } else if (util::parseHex(argv.front(), &num)) {
+            osDebugger.dumpProcess(ss, (u32)num);
+        } else {
+            osDebugger.dumpProcess(ss, argv.front());
+        }
+
+        retroShell << ss;
+    });
 
     root.add({"os", "catch"}, {"<task>"},
              "Pauses emulation on task launch",
-             &RetroShell::exec <Token::os, Token::cp>);
+             [this](Arguments& argv, long value) {
+
+        diagBoard.catchTask(argv.back());
+        retroShell << "Waiting for task '" << argv.back() << "' to start...\n";
+    });
 
     root.add({"os", "set"},
              "Configures the component");
 
     root.add({"os", "set", "diagboard" }, { Arg::boolean },
              "Attaches or detaches the debug expansion board",
-             &RetroShell::exec <Token::os, Token::set, Token::diagboard>);
+             [this](Arguments& argv, long value) {
+
+        diagBoard.setConfigItem(OPT_DIAG_BOARD, parseBool(argv));
+    });
 }
 
 }
diff --git a/Emulator/RetroShell/RetroShell.cpp b/Emulator/RetroShell/RetroShell.cpp
index 0b0f74ba7..331b3f0df 100644
--- a/Emulator/RetroShell/RetroShell.cpp
+++ b/Emulator/RetroShell/RetroShell.cpp
@@ -22,7 +22,7 @@ RetroShell::RetroShell(Amiga& ref) : SubComponent(ref), interpreter(ref)
 void
 RetroShell::_initialize()
 {
-    AmigaComponent::_initialize();
+    CoreComponent::_initialize();
 
     // Initialize the text storage
     clear();
@@ -39,7 +39,6 @@ RetroShell::_pause()
 {
     printState();
     remoteManager.rshServer.send(getPrompt());
-    
 }
 
 RetroShell&
@@ -172,8 +171,6 @@ RetroShell::welcome()
         storage << "vAmiga " << name << " ";
         remoteManager.rshServer << "vAmiga " << name << " Remote Server ";
         *this << Amiga::build() << '\n';
-
-        // *this << "vAmiga " << name << " " << Amiga::build() << '\n';
         *this << '\n';
         *this << "Copyright (C) Dirk W. Hoffmann. www.dirkwhoffmann.de" << '\n';
         *this << "Licensed under the GNU General Public License v3" << '\n';
@@ -271,7 +268,14 @@ RetroShell::press(RetroShellKey key, bool shift)
                 input.erase(input.begin() + cursor);
             }
             break;
-            
+
+        case RSKEY_CUT:
+
+            if (cursor < inputLength()) {
+                input.erase(input.begin() + cursor, input.end());
+            }
+            break;
+
         case RSKEY_BACKSPACE:
             
             if (cursor > 0) {
@@ -425,7 +429,7 @@ RetroShell::exec(const string &command)
     try {
         // Check if the command marked with 'try'
         ignoreError = command.rfind("try", 0) == 0;
-        
+
         // Call the interpreter
         interpreter.exec(command);
         
@@ -470,9 +474,9 @@ RetroShell::continueScript()
         try {
             exec(command);
             
-        } catch (ScriptInterruption &) {
+        } catch (ScriptInterruption &exc) {
             
-            msgQueue.put(MSG_SCRIPT_PAUSE, scriptLine);
+            msgQueue.put(MSG_SCRIPT_PAUSE, scriptLine, exc.data);
             return;
 
         } catch (std::exception &) {
@@ -555,12 +559,20 @@ RetroShell::help(const string &command)
 }
 
 void
-RetroShell::dump(AmigaObject &component, Category category)
+RetroShell::dump(CoreObject &component, Category category)
 {
     std::stringstream ss;
     
     {   SUSPENDED
-        
+
+        switch (category) {
+
+            case Category::Config: ss << "Current configuration:\n\n"; break;
+
+            default:
+                break;
+        }
+
         component.dump(category, ss);
     }
 
@@ -568,19 +580,19 @@ RetroShell::dump(AmigaObject &component, Category category)
 }
 
 void
-RetroShell::dumpConfig(AmigaObject &component)
+RetroShell::dumpConfig(CoreObject &component)
 {
     dump(component, Category::Config);
 }
 
 void
-RetroShell::dumpSummary(AmigaObject &component)
+RetroShell::dumpInspection(CoreObject &component)
 {
     dump(component, Category::Inspection);
 }
 
 void
-RetroShell::dumpDetails(AmigaObject &component)
+RetroShell::dumpDebug(CoreObject &component)
 {
     dump(component, Category::Debug);
 }
diff --git a/Emulator/RetroShell/RetroShell.h b/Emulator/RetroShell/RetroShell.h
index 6a5b828b5..9f229e47a 100644
--- a/Emulator/RetroShell/RetroShell.h
+++ b/Emulator/RetroShell/RetroShell.h
@@ -21,8 +21,9 @@ namespace vamiga {
 class RetroShell : public SubComponent {
 
     friend class RshServer;
+    friend class Interpreter;
     
-    // Interpreter for commands typed into the console window
+    // The command interpreter (parses commands typed into the console window)
     Interpreter interpreter;
 
     
@@ -81,7 +82,7 @@ class RetroShell : public SubComponent {
 
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 private:
@@ -91,7 +92,7 @@ class RetroShell : public SubComponent {
     
     
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
     
 private:
@@ -110,7 +111,14 @@ class RetroShell : public SubComponent {
     //
 
 public:
-    
+
+    // Prints a message
+    RetroShell &operator<<(char value);
+    RetroShell &operator<<(const string &value);
+    RetroShell &operator<<(int value);
+    RetroShell &operator<<(long value);
+    RetroShell &operator<<(std::stringstream &stream);
+
     // Returns the prompt
     const string &getPrompt();
 
@@ -123,21 +131,9 @@ class RetroShell : public SubComponent {
     // Moves the cursor forward to a certain column
     void tab(isize pos);
 
-    // Prints a message
-    RetroShell &operator<<(char value);
-    RetroShell &operator<<(const string &value);
-    RetroShell &operator<<(int value);
-    RetroShell &operator<<(long value);
-    RetroShell &operator<<(std::stringstream &stream);
-    
     // Assigns an additional output stream
     void setStream(std::ostream &os);
 
-private:
-    
-    // Marks the text storage as dirty
-    void needsDisplay();
-    
     // Clears the console window
     void clear();
 
@@ -147,9 +143,14 @@ class RetroShell : public SubComponent {
     // Prints the help line
     void printHelp();
 
-    // Prints a state summary (used by the debugger only)
+    // Prints a state summary (used by the debug shell)
     void printState();
 
+private:
+
+    // Marks the text storage as dirty
+    void needsDisplay();
+
     
     //
     // Managing user input
@@ -203,7 +204,7 @@ class RetroShell : public SubComponent {
     // Prints a textual description of an error in the console
     void describe(const std::exception &exception);
 
-    // Prints help messages for a given command string
+    // Prints a help message for a given command string
     void help(const string &command);
     
     
@@ -213,19 +214,10 @@ class RetroShell : public SubComponent {
     
 public:
     
-    template <Token t1>
-    void exec(Arguments& argv, long param) throws;
-    template <Token t1, Token t2>
-    void exec(Arguments& argv, long param) throws;
-    template <Token t1, Token t2, Token t3>
-    void exec(Arguments& argv, long param) throws;
-    template <Token t1, Token t2, Token t3, Token t4>
-    void exec(Arguments& argv, long param) throws;
-
-    void dump(AmigaObject &component, Category category);
-    void dumpConfig(AmigaObject &component);
-    void dumpSummary(AmigaObject &component);
-    void dumpDetails(AmigaObject &component);
+    void dump(CoreObject &component, Category category);
+    void dumpConfig(CoreObject &component);
+    void dumpInspection(CoreObject &component);
+    void dumpDebug(CoreObject &component);
 
     
     //
diff --git a/Emulator/RetroShell/RetroShellCmds.cpp b/Emulator/RetroShell/RetroShellCmds.cpp
deleted file mode 100644
index da097dba9..000000000
--- a/Emulator/RetroShell/RetroShellCmds.cpp
+++ /dev/null
@@ -1,1301 +0,0 @@
-// -----------------------------------------------------------------------------
-// This file is part of vAmiga
-//
-// Copyright (C) Dirk W. Hoffmann. www.dirkwhoffmann.de
-// Licensed under the GNU General Public License v3
-//
-// See https://www.gnu.org for license information
-// -----------------------------------------------------------------------------
-
-#include "config.h"
-#include "RetroShell.h"
-#include "Amiga.h"
-#include "BootBlockImage.h"
-#include "FSTypes.h"
-#include "IOUtils.h"
-#include "Parser.h"
-#include <fstream>
-#include <sstream>
-
-namespace vamiga {
-
-//
-// Top-level commands
-//
-
-template <> void
-RetroShell::exec <Token::debug> (Arguments &argv, long param)
-{
-    clear();
-    interpreter.switchInterpreter();
-    welcome();
-}
-
-template <> void
-RetroShell::exec <Token::clear> (Arguments &argv, long param)
-{
-    clear();
-}
-
-template <> void
-RetroShell::exec <Token::close> (Arguments &argv, long param)
-{
-    msgQueue.put(MSG_CLOSE_CONSOLE);
-}
-
-template <> void
-RetroShell::exec <Token::help> (Arguments &argv, long param)
-{
-    retroShell.help(argv.empty() ? "" : argv.front());
-}
-
-template <> void
-RetroShell::exec <Token::easteregg> (Arguments& argv, long param)
-{
-    retroShell << "GREETINGS PROFESSOR HOFFMANN." << '\n' << '\n';
-    retroShell << "THE ONLY WINNING MOVE IS NOT TO PLAY." << '\n' << '\n';
-    retroShell << "HOW ABOUT A NICE GAME OF CHESS?" << '\n';
-}
-
-template <> void
-RetroShell::exec <Token::source> (Arguments &argv, long param)
-{
-    auto stream = std::ifstream(argv.front());
-    if (!stream.is_open()) throw VAError(ERROR_FILE_NOT_FOUND, argv.front());
-    
-    execScript(stream);
-}
-
-template <> void
-RetroShell::exec <Token::wait> (Arguments &argv, long param)
-{
-    auto seconds = util::parseNum(argv.front());
-    
-    Cycle limit = agnus.clock + SEC(seconds);
-    amiga.retroShell.wakeUp = limit;
-    
-    throw ScriptInterruption("");
-}
-
-
-//
-// Rgression testing
-//
-
-template <> void
-RetroShell::exec <Token::regression, Token::setup> (Arguments &argv, long param)
-{
-    auto scheme = util::parseEnum <ConfigSchemeEnum> (argv[0]);
-    auto rom = argv[1];
-    auto ext = argv.size() > 2 ? argv[2] : "";
-    
-    amiga.regressionTester.prepare(scheme, rom, ext);
-    
-}
-
-template <> void
-RetroShell::exec <Token::regression, Token::run> (Arguments &argv, long param)
-{
-    amiga.regressionTester.run(argv.front());
-}
-
-template <> void
-RetroShell::exec <Token::screenshot, Token::set, Token::filename> (Arguments &argv, long param)
-{
-    amiga.regressionTester.dumpTexturePath = argv.front();
-}
-
-template <> void
-RetroShell::exec <Token::screenshot, Token::set, Token::cutout> (Arguments &argv, long param)
-{
-    std::vector<string> vec(argv.begin(), argv.end());
-    
-    isize x1 = util::parseNum(vec[0]);
-    isize y1 = util::parseNum(vec[1]);
-    isize x2 = util::parseNum(vec[2]);
-    isize y2 = util::parseNum(vec[3]);
-
-    amiga.regressionTester.x1 = x1;
-    amiga.regressionTester.y1 = y1;
-    amiga.regressionTester.x2 = x2;
-    amiga.regressionTester.y2 = y2;
-}
-
-template <> void
-RetroShell::exec <Token::screenshot, Token::save> (Arguments &argv, long param)
-{
-    amiga.regressionTester.dumpTexture(amiga, argv.front());
-}
-
-
-//
-// Amiga
-//
-
-template <> void
-RetroShell::exec <Token::amiga, Token::config> (Arguments& argv, long param)
-{
-    dumpConfig(amiga);
-}
-
-template <> void
-RetroShell::exec <Token::amiga, Token::set, Token::type> (Arguments& argv, long param)
-{
-    amiga.configure(OPT_VIDEO_FORMAT, util::parseEnum <VideoFormatEnum> (argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::amiga, Token::vsync> (Arguments &argv, long param)
-{
-    amiga.configure(OPT_VSYNC, util::parseOnOff(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::amiga, Token::init> (Arguments &argv, long param)
-{
-    auto scheme = util::parseEnum <ConfigSchemeEnum> (argv.front());
-
-    amiga.revertToFactorySettings();
-    amiga.configure(scheme);
-}
-
-template <> void
-RetroShell::exec <Token::amiga, Token::power> (Arguments &argv, long param)
-{
-    if (util::parseOnOff(argv.front())) {
-
-        amiga.powerOn();
-        amiga.run();
-
-    } else {
-
-        amiga.powerOff();
-    }
-}
-
-template <> void
-RetroShell::exec <Token::amiga, Token::reset> (Arguments &argv, long param)
-{
-    amiga.reset(true);
-}
-
-template <> void
-RetroShell::exec <Token::amiga, Token::defaults> (Arguments &argv, long param)
-{
-    dump(amiga, Category::Defaults);
-}
-
-
-//
-// Memory
-//
-
-template <> void
-RetroShell::exec <Token::memory, Token::config> (Arguments& argv, long param)
-{
-    dumpConfig(amiga.mem);
-}
-
-template <> void
-RetroShell::exec <Token::memory, Token::set, Token::chip> (Arguments& argv, long param)
-{
-    amiga.configure(OPT_CHIP_RAM, util::parseNum(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::memory, Token::set, Token::slow> (Arguments& argv, long param)
-{
-    amiga.configure(OPT_SLOW_RAM, util::parseNum(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::memory, Token::set, Token::fast> (Arguments& argv, long param)
-{
-    amiga.configure(OPT_FAST_RAM, util::parseNum(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::memory, Token::set, Token::extstart> (Arguments& argv, long param)
-{
-    amiga.configure(OPT_EXT_START, util::parseNum(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::memory, Token::set, Token::saveroms> (Arguments& argv, long param)
-{
-    amiga.configure(OPT_SAVE_ROMS, util::parseBool(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::memory, Token::set, Token::slowramdelay> (Arguments& argv, long param)
-{
-    amiga.configure(OPT_SLOW_RAM_DELAY, util::parseBool(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::memory, Token::set, Token::bankmap> (Arguments& argv, long param)
-{
-    amiga.configure(OPT_BANKMAP, util::parseEnum <BankMapEnum> (argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::memory, Token::set, Token::unmappingtype> (Arguments& argv, long param)
-{
-    amiga.configure(OPT_UNMAPPING_TYPE, util::parseEnum <UnmappedMemoryEnum> (argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::memory, Token::set, Token::raminitpattern> (Arguments& argv, long param)
-{
-    amiga.configure(OPT_RAM_INIT_PATTERN, util::parseEnum <RamInitPatternEnum> (argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::memory, Token::load, Token::rom> (Arguments& argv, long param)
-{
-    auto path = argv.front();
-    amiga.mem.loadRom(path.c_str());
-}
-
-template <> void
-RetroShell::exec <Token::memory, Token::load, Token::extrom> (Arguments& argv, long param)
-{
-    auto path = argv.front();
-    amiga.mem.loadExt(path.c_str());
-}
-
-
-//
-// CPU
-//
-
-template <> void
-RetroShell::exec <Token::cpu, Token::config> (Arguments &argv, long param)
-{
-    dumpConfig(amiga.cpu);
-}
-
-template <> void
-RetroShell::exec <Token::cpu, Token::set, Token::revision> (Arguments &argv, long param)
-{
-    auto value = util::parseEnum <CPURevisionEnum> (argv.front());
-    amiga.configure(OPT_CPU_REVISION, value);
-}
-
-template <> void
-RetroShell::exec <Token::cpu, Token::set, Token::dasm, Token::revision> (Arguments &argv, long param)
-{
-    auto value = util::parseEnum <DasmRevisionEnum> (argv.front());
-    amiga.configure(OPT_CPU_DASM_REVISION, value);
-}
-
-template <> void
-RetroShell::exec <Token::cpu, Token::set, Token::dasm, Token::syntax> (Arguments &argv, long param)
-{
-    auto value = util::parseEnum <DasmSyntaxEnum> (argv.front());
-    amiga.configure(OPT_CPU_DASM_SYNTAX, value);
-}
-
-template <> void
-RetroShell::exec <Token::cpu, Token::set, Token::overclocking> (Arguments &argv, long param)
-{
-    auto value = util::parseNum(argv.front());
-    amiga.configure(OPT_CPU_OVERCLOCKING, value);
-}
-
-template <> void
-RetroShell::exec <Token::cpu, Token::set, Token::regreset> (Arguments &argv, long param)
-{
-    auto value = util::parseNum(argv.front());
-    amiga.configure(OPT_CPU_RESET_VAL, value);
-}
-
-
-//
-// CIA
-//
-
-template <> void
-RetroShell::exec <Token::cia, Token::config> (Arguments &argv, long param)
-{
-    param == 0 ? dumpConfig(amiga.ciaA) : dumpConfig(amiga.ciaB);
-}
-
-template <> void
-RetroShell::exec <Token::cia, Token::set, Token::revision> (Arguments &argv, long param)
-{
-    auto value = util::parseEnum <CIARevisionEnum> (argv.front());
-    amiga.configure(OPT_CIA_REVISION, param, value);
-}
-
-template <> void
-RetroShell::exec <Token::cia, Token::set, Token::todbug> (Arguments &argv, long param)
-{
-    auto value = util::parseBool(argv.front());
-    amiga.configure(OPT_TODBUG, param, value);
-}
-
-template <> void
-RetroShell::exec <Token::cia, Token::set, Token::esync> (Arguments &argv, long param)
-{
-    auto value = util::parseBool(argv.front());
-    amiga.configure(OPT_ECLOCK_SYNCING, param, value);
-}
-
-
-//
-// Agnus
-//
-
-template <> void
-RetroShell::exec <Token::agnus, Token::config> (Arguments &argv, long param)
-{
-    dumpConfig(amiga.agnus);
-}
-
-template <> void
-RetroShell::exec <Token::agnus, Token::set, Token::revision> (Arguments &argv, long param)
-{
-    amiga.configure(OPT_AGNUS_REVISION, util::parseEnum <AgnusRevisionEnum> (argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::agnus, Token::set, Token::slowrammirror> (Arguments &argv, long param)
-{
-    amiga.configure(OPT_SLOW_RAM_MIRROR, util::parseBool(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::agnus, Token::set, Token::ptrdrops> (Arguments &argv, long param)
-{
-    auto value = util::parseBool(argv.front());
-    amiga.configure(OPT_PTR_DROPS, value);
-}
-
-/*
-template <> void
-RetroShell::exec <Token::agnus, Token::inspect, Token::state> (Arguments &argv, long param)
-{
-    dump(amiga.agnus, Category::Debug);
-}
-
-template <> void
-RetroShell::exec <Token::agnus, Token::inspect, Token::beam> (Arguments &argv, long param)
-{
-    dump(amiga.agnus, Category::Beam);
-}
-
-template <> void
-RetroShell::exec <Token::agnus, Token::inspect, Token::registers> (Arguments &argv, long param)
-{
-    dump(amiga.agnus, Category::Registers);
-}
-
-template <> void
-RetroShell::exec <Token::agnus, Token::inspect, Token::dma> (Arguments &argv, long param)
-{
-    dump(amiga.agnus, Category::Dma);
-}
-
-template <> void
-RetroShell::exec <Token::agnus, Token::inspect, Token::events> (Arguments &argv, long param)
-{
-    dump(amiga.agnus, Category::Events);
-}
-*/
-
-
-//
-// Blitter
-//
-
-template <> void
-RetroShell::exec <Token::blitter, Token::config> (Arguments& argv, long param)
-{
-    dumpConfig(amiga.agnus.blitter);
-}
-
-template <> void
-RetroShell::exec <Token::blitter, Token::set, Token::accuracy> (Arguments &argv, long param)
-{
-    amiga.configure(OPT_BLITTER_ACCURACY, util::parseNum(argv.front()));
-}
-
-/*
-template <> void
-RetroShell::exec <Token::blitter, Token::inspect, Token::state> (Arguments& argv, long param)
-{
-    dump(amiga.agnus.blitter, Category::Debug);
-}
-
-template <> void
-RetroShell::exec <Token::blitter, Token::inspect, Token::registers> (Arguments& argv, long param)
-{
-    dump(amiga.agnus.blitter, Category::Registers);
-}
-*/
-
-
-//
-// Copper
-//
-
-/*
-template <> void
-RetroShell::exec <Token::copper, Token::inspect, Token::state> (Arguments& argv, long param)
-{
-    dump(amiga.agnus.copper, Category::Debug);
-}
-
-template <> void
-RetroShell::exec <Token::copper, Token::inspect, Token::registers> (Arguments& argv, long param)
-{
-    dump(amiga.agnus.copper, Category::Registers);
-}
-
-template <> void
-RetroShell::exec <Token::copper, Token::list> (Arguments& argv, long param)
-{
-    auto value = util::parseNum(argv.front());
-    
-    switch (value) {
-        case 1: dump(amiga.agnus.copper, Category::List1); break;
-        case 2: dump(amiga.agnus.copper, Category::List2); break;
-        default: throw VAError(ERROR_OPT_INVARG, "1 or 2");
-    }
-}
-*/
-
-
-//
-// Denise
-//
-
-template <> void
-RetroShell::exec <Token::denise, Token::config> (Arguments& argv, long param)
-{
-    dumpConfig(amiga.denise);
-}
-
-template <> void
-RetroShell::exec <Token::denise, Token::set, Token::revision> (Arguments &argv, long param)
-{
-    amiga.configure(OPT_DENISE_REVISION, util::parseEnum <DeniseRevisionEnum> (argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::denise, Token::set, Token::tracking> (Arguments &argv, long param)
-{
-    amiga.configure(OPT_VIEWPORT_TRACKING, util::parseBool(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::denise, Token::set, Token::clxsprspr> (Arguments &argv, long param)
-{
-    amiga.configure(OPT_CLX_SPR_SPR, util::parseBool(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::denise, Token::set, Token::clxsprplf> (Arguments &argv, long param)
-{
-    amiga.configure(OPT_CLX_SPR_PLF, util::parseBool(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::denise, Token::set, Token::clxplfplf> (Arguments &argv, long param)
-{
-    amiga.configure(OPT_CLX_PLF_PLF, util::parseBool(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::denise, Token::set, Token::hide, Token::bitplanes> (Arguments &argv, long param)
-{
-    amiga.configure(OPT_HIDDEN_BITPLANES, util::parseNum(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::denise, Token::set, Token::hide, Token::sprites> (Arguments &argv, long param)
-{
-    amiga.configure(OPT_HIDDEN_SPRITES, util::parseNum(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::denise, Token::set, Token::hide, Token::layers> (Arguments &argv, long param)
-{
-    amiga.configure(OPT_HIDDEN_LAYERS, util::parseNum(argv.front()));
-}
-
-
-//
-// DMA Debugger
-//
-
-template <> void
-RetroShell::exec <Token::dmadebugger, Token::open> (Arguments& argv, long param)
-{
-    amiga.configure(OPT_DMA_DEBUG_ENABLE, true);
-}
-
-template <> void
-RetroShell::exec <Token::dmadebugger, Token::close> (Arguments& argv, long param)
-{
-    amiga.configure(OPT_DMA_DEBUG_ENABLE, false);
-}
-
-template <> void
-RetroShell::exec <Token::dmadebugger, Token::copper> (Arguments& argv, long param)
-{
-    amiga.configure(OPT_DMA_DEBUG_CHANNEL, DMA_CHANNEL_COPPER, util::parseBool(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::dmadebugger, Token::blitter> (Arguments& argv, long param)
-{
-    amiga.configure(OPT_DMA_DEBUG_CHANNEL, DMA_CHANNEL_BLITTER, util::parseBool(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::dmadebugger, Token::disk> (Arguments& argv, long param)
-{
-    amiga.configure(OPT_DMA_DEBUG_CHANNEL, DMA_CHANNEL_DISK, util::parseBool(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::dmadebugger, Token::audio> (Arguments& argv, long param)
-{
-    amiga.configure(OPT_DMA_DEBUG_CHANNEL, DMA_CHANNEL_AUDIO, util::parseBool(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::dmadebugger, Token::sprites> (Arguments& argv, long param)
-{
-    amiga.configure(OPT_DMA_DEBUG_CHANNEL, DMA_CHANNEL_SPRITE, util::parseBool(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::dmadebugger, Token::bitplanes> (Arguments& argv, long param)
-{
-    amiga.configure(OPT_DMA_DEBUG_CHANNEL, DMA_CHANNEL_BITPLANE, util::parseBool(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::dmadebugger, Token::cpu> (Arguments& argv, long param)
-{
-    amiga.configure(OPT_DMA_DEBUG_CHANNEL, DMA_CHANNEL_CPU, util::parseBool(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::dmadebugger, Token::refresh> (Arguments& argv, long param)
-{
-    amiga.configure(OPT_DMA_DEBUG_CHANNEL, DMA_CHANNEL_REFRESH, util::parseBool(argv.front()));
-}
-
-
-//
-// Monitor
-//
-
-template <> void
-RetroShell::exec <Token::monitor, Token::config> (Arguments& argv, long param)
-{
-    dumpConfig(amiga.denise.pixelEngine);
-}
-
-template <> void
-RetroShell::exec <Token::monitor, Token::set, Token::palette> (Arguments& argv, long param)
-{
-    amiga.configure(OPT_PALETTE, util::parseEnum <PaletteEnum> (argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::monitor, Token::set, Token::brightness> (Arguments& argv, long param)
-{
-    amiga.configure(OPT_BRIGHTNESS, util::parseNum(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::monitor, Token::set, Token::contrast> (Arguments& argv, long param)
-{
-    amiga.configure(OPT_CONTRAST, util::parseNum(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::monitor, Token::set, Token::saturation> (Arguments& argv, long param)
-{
-    amiga.configure(OPT_SATURATION, util::parseNum(argv.front()));
-}
-
-
-//
-// Audio
-//
-
-template <> void
-RetroShell::exec <Token::audio, Token::config> (Arguments& argv, long param)
-{
-    dumpConfig(amiga.paula.muxer);
-}
-
-template <> void
-RetroShell::exec <Token::audio, Token::filter, Token::config> (Arguments& argv, long param)
-{
-    *this << '\n';
-
-    *this << "Left channel:" << '\n';
-    dumpConfig(paula.muxer.filterL);
-
-    *this << "Right channel:" << '\n';
-    dumpConfig(paula.muxer.filterR);
-}
-
-template <> void
-RetroShell::exec <Token::audio, Token::set, Token::sampling> (Arguments& argv, long param)
-{
-    amiga.configure(OPT_SAMPLING_METHOD, util::parseEnum <SamplingMethodEnum> (argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::audio, Token::filter, Token::set, Token::type> (Arguments& argv, long param)
-{
-    amiga.configure(OPT_FILTER_TYPE, util::parseEnum <FilterTypeEnum> (argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::audio, Token::filter, Token::set, Token::activation> (Arguments& argv, long param)
-{
-    amiga.configure(OPT_FILTER_ACTIVATION, util::parseEnum <FilterActivationEnum> (argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::audio, Token::set, Token::volume> (Arguments& argv, long param)
-{
-    switch (param) {
-            
-        case 0: amiga.configure(OPT_AUDVOL, 0, util::parseNum(argv.front())); break;
-        case 1: amiga.configure(OPT_AUDVOL, 1, util::parseNum(argv.front())); break;
-        case 2: amiga.configure(OPT_AUDVOL, 2, util::parseNum(argv.front())); break;
-        case 3: amiga.configure(OPT_AUDVOL, 3, util::parseNum(argv.front())); break;
-        case 4: amiga.configure(OPT_AUDVOLL, util::parseNum(argv.front())); break;
-        case 5: amiga.configure(OPT_AUDVOLR, util::parseNum(argv.front())); break;
-            
-        default:
-            fatalError;
-    }
-}
-
-template <> void
-RetroShell::exec <Token::audio, Token::set, Token::pan> (Arguments& argv, long param)
-{
-    amiga.configure(OPT_AUDPAN, param, util::parseNum(argv.front()));
-}
-
-
-//
-// Paula
-//
-
-/*
-template <> void
-RetroShell::exec <Token::paula, Token::inspect, Token::state> (Arguments& argv, long param)
-{
-    dumpDetails(amiga.paula);
-}
-
-template <> void
-RetroShell::exec <Token::paula, Token::inspect, Token::registers> (Arguments& argv, long param)
-{
-    dump(amiga.paula, Category::Registers);
-}
-*/
-
-
-//
-// RTC
-//
-
-template <> void
-RetroShell::exec <Token::rtc, Token::config> (Arguments& argv, long param)
-{
-    dumpConfig(amiga.rtc);
-}
-
-template <> void
-RetroShell::exec <Token::rtc, Token::set, Token::revision> (Arguments &argv, long param)
-{
-    amiga.configure(OPT_RTC_MODEL, util::parseEnum <RTCRevisionEnum> (argv.front()));
-}
-
-
-//
-// Keyboard
-//
-
-template <> void
-RetroShell::exec <Token::keyboard, Token::config> (Arguments& argv, long param)
-{
-    dumpConfig(amiga.keyboard);
-}
-
-template <> void
-RetroShell::exec <Token::keyboard, Token::set, Token::accuracy> (Arguments &argv, long param)
-{
-    amiga.configure(OPT_ACCURATE_KEYBOARD, util::parseBool(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::keyboard, Token::press> (Arguments& argv, long param)
-{
-    auto keycode = util::parseNum(argv.front());
-    keyboard.autoType(KeyCode(keycode));
-}
-
-
-//
-// Mouse
-//
-
-template <> void
-RetroShell::exec <Token::mouse, Token::config> (Arguments& argv, long param)
-{
-    auto &port = (param == 0) ? amiga.controlPort1 : amiga.controlPort2;
-    dumpConfig(port.mouse);
-}
-
-template <> void
-RetroShell::exec <Token::mouse, Token::set, Token::pullup> (Arguments &argv, long param)
-{
-    auto port = (param == 0) ? ControlPort::PORT1 : ControlPort::PORT2;
-    amiga.configure(OPT_PULLUP_RESISTORS, port, util::parseBool(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::mouse, Token::set, Token::shakedetector> (Arguments &argv, long param)
-{
-    auto port = (param == 0) ? ControlPort::PORT1 : ControlPort::PORT2;
-    amiga.configure(OPT_SHAKE_DETECTION, port, util::parseBool(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::mouse, Token::set, Token::velocity> (Arguments &argv, long param)
-{
-    auto port = (param == 0) ? ControlPort::PORT1 : ControlPort::PORT2;
-    amiga.configure(OPT_MOUSE_VELOCITY, port, util::parseNum(argv.front()));
-}
-
-/*
-template <> void
-RetroShell::exec <Token::mouse, Token::inspect> (Arguments& argv, long param)
-{
-    auto &port = (param == 0) ? amiga.controlPort1 : amiga.controlPort2;
-    dumpDetails(port.mouse);
-}
-*/
-
-template <> void
-RetroShell::exec <Token::mouse, Token::press, Token::left> (Arguments& argv, long param)
-{
-    auto &port = (param == 0) ? amiga.controlPort1 : amiga.controlPort2;
-    port.mouse.pressAndReleaseLeft();
-}
-
-template <> void
-RetroShell::exec <Token::mouse, Token::press, Token::right> (Arguments& argv, long param)
-{
-    auto &port = (param == 0) ? amiga.controlPort1 : amiga.controlPort2;
-    port.mouse.pressAndReleaseRight();
-}
-
-
-//
-// Joystick
-//
-
-template <> void
-RetroShell::exec <Token::joystick, Token::config> (Arguments& argv, long param)
-{
-    auto &port = (param == 0) ? amiga.controlPort1 : amiga.controlPort2;
-    dumpConfig(port.joystick);
-}
-
-template <> void
-RetroShell::exec <Token::joystick, Token::set, Token::autofire> (Arguments &argv, long param)
-{
-    auto port = (param == 0) ? ControlPort::PORT1 : ControlPort::PORT2;
-    amiga.configure(OPT_AUTOFIRE, port, util::parseBool(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::joystick, Token::set, Token::bullets> (Arguments &argv, long param)
-{
-    auto port = (param == 0) ? ControlPort::PORT1 : ControlPort::PORT2;
-    amiga.configure(OPT_AUTOFIRE_BULLETS, port, util::parseNum(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::joystick, Token::set, Token::delay> (Arguments &argv, long param)
-{
-    auto port = (param == 0) ? ControlPort::PORT1 : ControlPort::PORT2;
-    amiga.configure(OPT_AUTOFIRE_DELAY, port, util::parseNum(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::joystick, Token::press> (Arguments& argv, long param)
-{
-    auto &port = (param == 0) ? amiga.controlPort1 : amiga.controlPort2;
-    auto nr = util::parseNum(argv.front());
-
-    switch (nr) {
-
-        case 1: port.joystick.trigger(PRESS_FIRE); break;
-        case 2: port.joystick.trigger(PRESS_FIRE2); break;
-        case 3: port.joystick.trigger(PRESS_FIRE3); break;
-
-        default:
-            throw VAError(ERROR_OPT_INVARG, "1...3");
-    }
-}
-
-template <> void
-RetroShell::exec <Token::joystick, Token::unpress> (Arguments& argv, long param)
-{
-    auto &port = (param == 0) ? amiga.controlPort1 : amiga.controlPort2;
-    auto nr = util::parseNum(argv.front());
-
-    switch (nr) {
-
-        case 1: port.joystick.trigger(RELEASE_FIRE); break;
-        case 2: port.joystick.trigger(RELEASE_FIRE2); break;
-        case 3: port.joystick.trigger(RELEASE_FIRE3); break;
-
-        default:
-            throw VAError(ERROR_OPT_INVARG, "1...3");
-    }
-}
-
-template <> void
-RetroShell::exec <Token::joystick, Token::pull, Token::left> (Arguments& argv, long param)
-{
-    auto &port = (param == 0) ? amiga.controlPort1 : amiga.controlPort2;
-    port.joystick.trigger(PULL_LEFT);
-}
-
-template <> void
-RetroShell::exec <Token::joystick, Token::pull, Token::right> (Arguments& argv, long param)
-{
-    auto &port = (param == 0) ? amiga.controlPort1 : amiga.controlPort2;
-    port.joystick.trigger(PULL_RIGHT);
-}
-
-template <> void
-RetroShell::exec <Token::joystick, Token::pull, Token::up> (Arguments& argv, long param)
-{
-    auto &port = (param == 0) ? amiga.controlPort1 : amiga.controlPort2;
-    port.joystick.trigger(PULL_UP);
-}
-
-template <> void
-RetroShell::exec <Token::joystick, Token::pull, Token::down> (Arguments& argv, long param)
-{
-    auto &port = (param == 0) ? amiga.controlPort1 : amiga.controlPort2;
-    port.joystick.trigger(PULL_DOWN);
-}
-
-template <> void
-RetroShell::exec <Token::joystick, Token::release, Token::xaxis> (Arguments& argv, long param)
-{
-    auto &port = (param == 0) ? amiga.controlPort1 : amiga.controlPort2;
-    port.joystick.trigger(RELEASE_X);
-}
-
-template <> void
-RetroShell::exec <Token::joystick, Token::release, Token::yaxis> (Arguments& argv, long param)
-{
-    auto &port = (param == 0) ? amiga.controlPort1 : amiga.controlPort2;
-    port.joystick.trigger(RELEASE_Y);
-}
-
-
-//
-// Serial port
-//
-
-template <> void
-RetroShell::exec <Token::serial, Token::config> (Arguments& argv, long param)
-{
-    dumpConfig(amiga.serialPort);
-}
-
-template <> void
-RetroShell::exec <Token::serial, Token::set, Token::device> (Arguments &argv, long param)
-{
-    amiga.configure(OPT_SERIAL_DEVICE, util::parseEnum <SerialPortDeviceEnum> (argv.front()));
-}
-
-
-//
-// Disk controller
-//
-
-template <> void
-RetroShell::exec <Token::dc, Token::config> (Arguments& argv, long param)
-{
-    dumpConfig(amiga.paula.diskController);
-}
-
-template <> void
-RetroShell::exec <Token::dc, Token::speed> (Arguments& argv, long param)
-{
-    amiga.configure(OPT_DRIVE_SPEED, util::parseNum(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::dc, Token::dsksync, Token::autosync> (Arguments& argv, long param)
-{
-    amiga.configure(OPT_AUTO_DSKSYNC, util::parseBool(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::dc, Token::dsksync, Token::lock> (Arguments& argv, long param)
-{
-    amiga.configure(OPT_LOCK_DSKSYNC, util::parseBool(argv.front()));
-}
-
-
-//
-// Df0, Df1, Df2, Df3
-//
-
-template <> void
-RetroShell::exec <Token::dfn, Token::config> (Arguments& argv, long param)
-{
-    dumpConfig(*amiga.df[param]);
-}
-
-template <> void
-RetroShell::exec <Token::dfn, Token::audiate, Token::insert> (Arguments& argv, long param)
-{
-    long num = util::parseNum(argv.front());
-
-    if (param >= 0 && param <= 3) {
-        amiga.configure(OPT_INSERT_VOLUME, param, num);
-    } else {
-        amiga.configure(OPT_INSERT_VOLUME, num);
-    }
-}
-
-template <> void
-RetroShell::exec <Token::dfn, Token::audiate, Token::eject> (Arguments& argv, long param)
-{
-    long num = util::parseNum(argv.front());
-    
-    if (param >= 0 && param <= 3) {
-        amiga.configure(OPT_EJECT_VOLUME, param, num);
-    } else {
-        amiga.configure(OPT_EJECT_VOLUME, num);
-    }
-}
-
-template <> void
-RetroShell::exec <Token::dfn, Token::audiate, Token::step> (Arguments& argv, long param)
-{
-    long num = util::parseNum(argv.front());
-    
-    if (param >= 0 && param <= 3) {
-        amiga.configure(OPT_STEP_VOLUME, param, num);
-    } else {
-        amiga.configure(OPT_STEP_VOLUME, num);
-    }
-}
-
-template <> void
-RetroShell::exec <Token::dfn, Token::audiate, Token::poll> (Arguments& argv, long param)
-{
-    long num = util::parseNum(argv.front());
-    
-    if (param >= 0 && param <= 3) {
-        amiga.configure(OPT_POLL_VOLUME, param, num);
-    } else {
-        amiga.configure(OPT_POLL_VOLUME, num);
-    }
-}
-
-template <> void
-RetroShell::exec <Token::dfn, Token::eject> (Arguments& argv, long param)
-{
-    amiga.df[param]->ejectDisk();
-}
-
-template <> void
-RetroShell::exec <Token::dfn, Token::connect> (Arguments& argv, long param)
-{
-    amiga.configure(OPT_DRIVE_CONNECT, param, true);
-}
-
-template <> void
-RetroShell::exec <Token::dfn, Token::disconnect> (Arguments& argv, long param)
-{
-    amiga.configure(OPT_DRIVE_CONNECT, param, false);
-}
-
-template <> void
-RetroShell::exec <Token::dfn, Token::insert> (Arguments& argv, long param)
-{
-    assert(param >= 0 && param <= 3);
-
-    auto path = argv.front();
-    df[param]->swapDisk(path);
-}
-
-template <> void
-RetroShell::exec <Token::dfn, Token::set, Token::model> (Arguments& argv, long param)
-{
-    long num = util::parseEnum <FloppyDriveTypeEnum> (argv.front());
-    
-    if (param >= 0 && param <= 3) {
-        amiga.configure(OPT_DRIVE_TYPE, param, num);
-    } else {
-        amiga.configure(OPT_DRIVE_TYPE, num);
-    }
-}
-
-template <> void
-RetroShell::exec <Token::dc, Token::set, Token::rpm> (Arguments& argv, long param)
-{
-    long num = util::parseNum(argv.front());
-
-    if (param >= 0 && param <= 3) {
-        amiga.configure(OPT_DRIVE_RPM, param, num);
-    } else {
-        amiga.configure(OPT_DRIVE_RPM, num);
-    }
-}
-
-template <> void
-RetroShell::exec <Token::dfn, Token::set, Token::pan> (Arguments& argv, long param)
-{
-    long num = util::parseNum(argv.front());
-    
-    if (param >= 0 && param <= 3) {
-        amiga.configure(OPT_DRIVE_PAN, param, num);
-    } else {
-        amiga.configure(OPT_DRIVE_PAN, num);
-    }
-}
-
-template <> void
-RetroShell::exec <Token::dfn, Token::set, Token::mechanics> (Arguments& argv, long param)
-{
-    auto scheme = util::parseEnum<DriveMechanicsEnum>(argv[0]);
-
-    if (param >= 0 && param <= 3) {
-        amiga.configure(OPT_DRIVE_MECHANICS, param, scheme);
-    } else {
-        amiga.configure(OPT_DRIVE_MECHANICS, scheme);
-    }
-}
-
-template <> void
-RetroShell::exec <Token::dfn, Token::set, Token::searchpath> (Arguments& argv, long param)
-{
-    string path = argv.front();
-
-    if (param == 0 || param > 3) df0.setSearchPath(path);
-    if (param == 1 || param > 3) df1.setSearchPath(path);
-    if (param == 2 || param > 3) df2.setSearchPath(path);
-    if (param == 3 || param > 3) df3.setSearchPath(path);
-}
-
-template <> void
-RetroShell::exec <Token::dfn, Token::set, Token::swapdelay> (Arguments& argv, long param)
-{
-    long num = util::parseNum(argv.front());
-    
-    if (param >= 0 && param <= 3) {
-        amiga.configure(OPT_DISK_SWAP_DELAY, param, num);
-    } else {
-        amiga.configure(OPT_DISK_SWAP_DELAY, num);
-    }
-}
-
-
-//
-// Hd0, Hd1, Hd2, Hd3
-//
-
-template <> void
-RetroShell::exec <Token::hdn, Token::config> (Arguments& argv, long param)
-{
-    dumpConfig(*amiga.hd[param]);
-}
-
-template <> void
-RetroShell::exec <Token::hdn, Token::set, Token::pan> (Arguments& argv, long param)
-{
-    long num = util::parseNum(argv.front());
-    
-    if (param >= 0 && param <= 3) {
-        amiga.configure(OPT_HDR_PAN, param, num);
-    } else {
-        amiga.configure(OPT_HDR_PAN, num);
-    }
-}
-
-template <> void
-RetroShell::exec <Token::hdn, Token::audiate, Token::step> (Arguments& argv, long param)
-{
-    long num = util::parseNum(argv.front());
-    
-    if (param >= 0 && param <= 3) {
-        amiga.configure(OPT_HDR_STEP_VOLUME, param, num);
-    } else {
-        amiga.configure(OPT_HDR_STEP_VOLUME, num);
-    }
-}
-
-template <> void
-RetroShell::exec <Token::hdn, Token::geometry> (Arguments& argv, long param)
-{
-    auto c = util::parseNum(argv[0]);
-    auto h = util::parseNum(argv[1]);
-    auto s = util::parseNum(argv[2]);
-
-    amiga.hd[param]->changeGeometry(c, h, s);
-}
-
-//
-// Zorro boards
-//
-
-template <> void
-RetroShell::exec <Token::zorro, Token::list> (Arguments& argv, long param)
-{
-    dumpDetails(zorro);
-}
-
-template <> void
-RetroShell::exec <Token::zorro, Token::inspect> (Arguments& argv, long param)
-{
-    auto value = util::parseNum(argv.front());
-    
-    if (auto board = zorro.getBoard(value); board != nullptr) {
-
-        dump(*board, Category::Properties);
-        dumpDetails(*board);
-        dump(*board, Category::Stats);
-    }
-}
-
-
-//
-// Remote servers
-//
-
-template <> void
-RetroShell::exec <Token::server> (Arguments& argv, long param)
-{
-    dump(remoteManager, Category::Status);
-}
-
-template <> void
-RetroShell::exec <Token::server, Token::serial, Token::set, Token::port> (Arguments& argv, long param)
-{
-    remoteManager.serServer.setConfigItem(OPT_SRV_PORT, util::parseNum(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::server, Token::serial, Token::set, Token::verbose> (Arguments& argv, long param)
-{
-    remoteManager.serServer.setConfigItem(OPT_SRV_PORT, util::parseBool(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::server, Token::serial, Token::config> (Arguments& argv, long param)
-{
-    dumpConfig(remoteManager.serServer);
-}
-
-template <> void
-RetroShell::exec <Token::server, Token::serial, Token::inspect> (Arguments& argv, long param)
-{
-    dumpDetails(remoteManager.serServer);
-}
-
-template <> void
-RetroShell::exec <Token::server, Token::rshell, Token::start> (Arguments& argv, long param)
-{
-    remoteManager.rshServer.start();
-}
-
-template <> void
-RetroShell::exec <Token::server, Token::rshell, Token::stop> (Arguments& argv, long param)
-{
-    remoteManager.rshServer.stop();
-}
-
-template <> void
-RetroShell::exec <Token::server, Token::rshell, Token::disconnect> (Arguments& argv, long param)
-{
-    remoteManager.rshServer.disconnect();
-}
-
-template <> void
-RetroShell::exec <Token::server, Token::rshell, Token::set, Token::port> (Arguments& argv, long param)
-{
-    remoteManager.rshServer.setConfigItem(OPT_SRV_PORT, util::parseNum(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::server, Token::rshell, Token::set, Token::verbose> (Arguments& argv, long param)
-{
-    remoteManager.rshServer.setConfigItem(OPT_SRV_PORT, util::parseBool(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::server, Token::rshell, Token::config> (Arguments& argv, long param)
-{
-    dumpConfig(remoteManager.rshServer);
-}
-
-template <> void
-RetroShell::exec <Token::server, Token::rshell, Token::inspect> (Arguments& argv, long param)
-{
-    dumpDetails(remoteManager.rshServer);
-}
-
-template <> void
-RetroShell::exec <Token::server, Token::gdb, Token::attach> (Arguments& argv, long param)
-{
-    remoteManager.gdbServer.attach(argv.front());
-}
-
-template <> void
-RetroShell::exec <Token::server, Token::gdb, Token::detach> (Arguments& argv, long param)
-{
-    remoteManager.gdbServer.detach();
-}
-
-template <> void
-RetroShell::exec <Token::server, Token::gdb, Token::set, Token::port> (Arguments& argv, long param)
-{
-    remoteManager.gdbServer.setConfigItem(OPT_SRV_PORT, util::parseNum(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::server, Token::gdb, Token::set, Token::verbose> (Arguments& argv, long param)
-{
-    remoteManager.gdbServer.setConfigItem(OPT_SRV_VERBOSE, util::parseBool(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::server, Token::gdb, Token::config> (Arguments& argv, long param)
-{
-    dumpConfig(remoteManager.gdbServer);
-}
-
-template <> void
-RetroShell::exec <Token::server, Token::gdb, Token::inspect> (Arguments& argv, long param)
-{
-    dumpDetails(remoteManager.gdbServer);
-}
-
-}
diff --git a/Emulator/RetroShell/RetroShellDebugCmds.cpp b/Emulator/RetroShell/RetroShellDebugCmds.cpp
deleted file mode 100644
index 40bfb6770..000000000
--- a/Emulator/RetroShell/RetroShellDebugCmds.cpp
+++ /dev/null
@@ -1,802 +0,0 @@
-// -----------------------------------------------------------------------------
-// This file is part of vAmiga
-//
-// Copyright (C) Dirk W. Hoffmann. www.dirkwhoffmann.de
-// Licensed under the GNU General Public License v3
-//
-// See https://www.gnu.org for license information
-// -----------------------------------------------------------------------------
-
-#include "config.h"
-#include "RetroShell.h"
-#include "Amiga.h"
-#include "BootBlockImage.h"
-#include "FSTypes.h"
-#include "IOUtils.h"
-#include "Parser.h"
-#include <fstream>
-#include <sstream>
-
-namespace vamiga {
-
-//
-// Instruction Stream
-//
-
-template <> void
-RetroShell::exec <Token::pause> (Arguments& argv, long param)
-{
-    amiga.pause();
-}
-
-template <> void
-RetroShell::exec <Token::run> (Arguments& argv, long param)
-{
-    amiga.run();
-}
-
-template <> void
-RetroShell::exec <Token::step> (Arguments& argv, long param)
-{
-    amiga.stepInto();
-}
-
-template <> void
-RetroShell::exec <Token::next> (Arguments& argv, long param)
-{
-    amiga.stepOver();
-}
-
-template <> void
-RetroShell::exec <Token::jump> (Arguments& argv, long param)
-{
-    auto value = util::parseNum(argv.front());
-    amiga.cpu.jump((u32)value);
-}
-
-template <> void
-RetroShell::exec <Token::disassemble> (Arguments& argv, long param)
-{
-    std::stringstream ss;
-
-    auto addr = argv.empty() ? cpu.getPC0() : u32(util::parseNum(argv.front()));
-    cpu.disassembleRange(ss, addr, 16);
-
-    *this << '\n' << ss << '\n';
-}
-
-
-//
-// Breakpoints
-//
-
-template <> void
-RetroShell::exec <Token::bp> (Arguments& argv, long param)
-{
-    dump(amiga.cpu, Category::Breakpoints);
-}
-
-template <> void
-RetroShell::exec <Token::bp, Token::at> (Arguments& argv, long param)
-{
-    amiga.cpu.setBreakpoint(u32(util::parseNum(argv.front())));
-}
-
-template <> void
-RetroShell::exec <Token::bp, Token::del> (Arguments& argv, long param)
-{
-    amiga.cpu.deleteBreakpoint(util::parseNum(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::bp, Token::enable> (Arguments& argv, long param)
-{
-    amiga.cpu.enableBreakpoint(util::parseNum(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::bp, Token::disable> (Arguments& argv, long param)
-{
-    amiga.cpu.disableBreakpoint(util::parseNum(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::bp, Token::ignore> (Arguments& argv, long param)
-{
-    amiga.cpu.ignoreBreakpoint(util::parseNum(argv[0]), util::parseNum(argv[1]));
-}
-
-
-//
-// Watchpoints
-//
-
-template <> void
-RetroShell::exec <Token::wp> (Arguments& argv, long param)
-{
-    dump(amiga.cpu, Category::Watchpoints);
-}
-
-template <> void
-RetroShell::exec <Token::wp, Token::at> (Arguments& argv, long param)
-{
-    amiga.cpu.setWatchpoint(u32(util::parseNum(argv.front())));
-}
-
-template <> void
-RetroShell::exec <Token::wp, Token::del> (Arguments& argv, long param)
-{
-    amiga.cpu.deleteWatchpoint(util::parseNum(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::wp, Token::enable> (Arguments& argv, long param)
-{
-    amiga.cpu.enableWatchpoint(util::parseNum(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::wp, Token::disable> (Arguments& argv, long param)
-{
-    amiga.cpu.disableWatchpoint(util::parseNum(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::wp, Token::ignore> (Arguments& argv, long param)
-{
-    amiga.cpu.ignoreWatchpoint(util::parseNum(argv[0]), util::parseNum(argv[1]));
-}
-
-
-//
-// Catchpoints
-//
-
-template <> void
-RetroShell::exec <Token::cp> (Arguments& argv, long param)
-{
-    dump(amiga.cpu, Category::Catchpoints);
-}
-
-template <> void
-RetroShell::exec <Token::cp, Token::vector> (Arguments& argv, long param)
-{
-    auto nr = util::parseNum(argv.front());
-    if (nr < 0 || nr > 255) throw VAError(ERROR_OPT_INVARG, "0...255");
-    amiga.cpu.setCatchpoint(u8(nr));
-}
-
-template <> void
-RetroShell::exec <Token::cp, Token::interrupt> (Arguments& argv, long param)
-{
-    auto nr = util::parseNum(argv.front());
-    if (nr < 1 || nr > 7) throw VAError(ERROR_OPT_INVARG, "1...7");
-    amiga.cpu.setCatchpoint(u8(nr + 24));
-}
-
-template <> void
-RetroShell::exec <Token::cp, Token::trap> (Arguments& argv, long param)
-{
-    auto nr = util::parseNum(argv.front());
-    if (nr < 0 || nr > 15) throw VAError(ERROR_OPT_INVARG, "0...15");
-    amiga.cpu.setCatchpoint(u8(nr + 32));
-}
-
-template <> void
-RetroShell::exec <Token::cp, Token::del> (Arguments& argv, long param)
-{
-    amiga.cpu.deleteCatchpoint(util::parseNum(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::cp, Token::enable> (Arguments& argv, long param)
-{
-    amiga.cpu.enableCatchpoint(util::parseNum(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::cp, Token::disable> (Arguments& argv, long param)
-{
-    amiga.cpu.disableCatchpoint(util::parseNum(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::cp, Token::ignore> (Arguments& argv, long param)
-{
-    amiga.cpu.ignoreCatchpoint(util::parseNum(argv[0]), util::parseNum(argv[1]));
-}
-
-
-//
-// Copper breakpoints
-//
-
-template <> void
-RetroShell::exec <Token::cbp> (Arguments& argv, long param)
-{
-    dump(copper.debugger, Category::Breakpoints);
-}
-
-template <> void
-RetroShell::exec <Token::cbp, Token::at> (Arguments& argv, long param)
-{
-    copper.debugger.setBreakpoint(u32(util::parseNum(argv.front())));
-}
-
-template <> void
-RetroShell::exec <Token::cbp, Token::del> (Arguments& argv, long param)
-{
-    copper.debugger.deleteBreakpoint(util::parseNum(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::cbp, Token::enable> (Arguments& argv, long param)
-{
-    copper.debugger.enableBreakpoint(util::parseNum(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::cbp, Token::disable> (Arguments& argv, long param)
-{
-    copper.debugger.disableBreakpoint(util::parseNum(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::cbp, Token::ignore> (Arguments& argv, long param)
-{
-    copper.debugger.ignoreBreakpoint(util::parseNum(argv[0]), util::parseNum(argv[1]));
-}
-
-
-//
-// Copper watchpoints
-//
-
-template <> void
-RetroShell::exec <Token::cwp> (Arguments& argv, long param)
-{
-    dump(copper.debugger, Category::Watchpoints);
-}
-
-template <> void
-RetroShell::exec <Token::cwp, Token::at> (Arguments& argv, long param)
-{
-    copper.debugger.setWatchpoint(u32(util::parseNum(argv.front())));
-}
-
-template <> void
-RetroShell::exec <Token::cwp, Token::del> (Arguments& argv, long param)
-{
-    copper.debugger.deleteWatchpoint(util::parseNum(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::cwp, Token::enable> (Arguments& argv, long param)
-{
-    copper.debugger.enableWatchpoint(util::parseNum(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::cwp, Token::disable> (Arguments& argv, long param)
-{
-    copper.debugger.disableWatchpoint(util::parseNum(argv.front()));
-}
-
-template <> void
-RetroShell::exec <Token::cwp, Token::ignore> (Arguments& argv, long param)
-{
-    copper.debugger.ignoreWatchpoint(util::parseNum(argv[0]), util::parseNum(argv[1]));
-}
-
-
-//
-// Amiga
-//
-
-template <> void
-RetroShell::exec <Token::amiga> (Arguments &argv, long param)
-{
-    dump(amiga, Category::Inspection);
-}
-
-template <> void
-RetroShell::exec <Token::amiga, Token::host> (Arguments &argv, long param)
-{
-    dump(host, Category::Inspection);
-}
-
-template <> void
-RetroShell::exec <Token::amiga, Token::debug> (Arguments &argv, long param)
-{
-    dump(amiga, Category::Debug);
-}
-
-
-//
-// Memory
-//
-
-template <> void
-RetroShell::exec <Token::memory> (Arguments &argv, long param)
-{
-    dump(mem, Category::BankMap);
-}
-
-template <> void
-RetroShell::exec <Token::memory, Token::memdump> (Arguments& argv, long param)
-{
-    std::stringstream ss;
-
-    mem.memDump<ACCESSOR_CPU>(ss, u32(util::parseNum(argv.front())));
-
-    *this << '\n' << ss << '\n';
-}
-
-template <> void
-RetroShell::exec <Token::memory, Token::bankmap> (Arguments& argv, long param)
-{
-    dump(amiga, Category::BankMap);
-}
-
-template <> void
-RetroShell::exec <Token::memory, Token::checksums> (Arguments& argv, long param)
-{
-    dump(amiga.mem, Category::Checksums);
-}
-
-
-//
-// CPU
-//
-
-template <> void
-RetroShell::exec <Token::cpu> (Arguments &argv, long param)
-{
-    dumpSummary(cpu);
-}
-
-template <> void
-RetroShell::exec <Token::cpu, Token::debug> (Arguments &argv, long param)
-{
-    dumpDetails(cpu);
-}
-
-template <> void
-RetroShell::exec <Token::cpu, Token::vectors> (Arguments& argv, long param)
-{
-    dump(cpu, Category::Vectors);
-}
-
-
-//
-// CIA
-//
-
-template <> void
-RetroShell::exec <Token::cia> (Arguments &argv, long param)
-{
-    param == 0 ? dumpSummary(ciaa) : dumpSummary(ciab);
-}
-
-template <> void
-RetroShell::exec <Token::cia, Token::debug> (Arguments &argv, long param)
-{
-    param == 0 ? dumpDetails(ciaa) : dumpDetails(ciab);
-}
-
-template <> void
-RetroShell::exec <Token::cia, Token::tod> (Arguments &argv, long param)
-{
-    param == 0 ? dump(ciaa, Category::Tod) : dump(ciab, Category::Tod);
-}
-
-
-//
-// Agnus
-//
-
-template <> void
-RetroShell::exec <Token::agnus> (Arguments &argv, long param)
-{
-    dumpSummary(agnus);
-}
-
-template <> void
-RetroShell::exec <Token::agnus, Token::debug> (Arguments &argv, long param)
-{
-    dumpDetails(agnus);
-}
-
-template <> void
-RetroShell::exec <Token::agnus, Token::beam> (Arguments &argv, long param)
-{
-    dump(amiga.agnus, Category::Beam);
-}
-
-template <> void
-RetroShell::exec <Token::agnus, Token::dma> (Arguments &argv, long param)
-{
-    dump(amiga.agnus, Category::Dma);
-}
-
-template <> void
-RetroShell::exec <Token::agnus, Token::events> (Arguments &argv, long param)
-{
-    dump(amiga.agnus, Category::Events);
-}
-
-
-//
-// Blitter
-//
-
-template <> void
-RetroShell::exec <Token::blitter> (Arguments &argv, long param)
-{
-    dumpSummary(amiga.agnus.blitter);
-}
-
-template <> void
-RetroShell::exec <Token::blitter, Token::debug> (Arguments &argv, long param)
-{
-    dumpDetails(amiga.agnus.blitter);
-}
-
-
-//
-// Copper
-//
-
-template <> void
-RetroShell::exec <Token::copper> (Arguments &argv, long param)
-{
-    dumpSummary(amiga.agnus.copper);
-}
-
-template <> void
-RetroShell::exec <Token::copper, Token::debug> (Arguments &argv, long param)
-{
-    dumpDetails(amiga.agnus.copper);
-}
-
-template <> void
-RetroShell::exec <Token::copper, Token::list> (Arguments& argv, long param)
-{
-    auto value = util::parseNum(argv.front());
-
-    switch (value) {
-
-        case 1: dump(amiga.agnus.copper, Category::List1); break;
-        case 2: dump(amiga.agnus.copper, Category::List2); break;
-
-        default:
-            throw VAError(ERROR_OPT_INVARG, "1 or 2");
-    }
-}
-
-
-//
-// Paula
-//
-
-template <> void
-RetroShell::exec <Token::paula> (Arguments &argv, long param)
-{
-    dumpSummary(paula);
-}
-
-template <> void
-RetroShell::exec <Token::paula, Token::debug> (Arguments &argv, long param)
-{
-    dumpDetails(paula);
-}
-
-template <> void
-RetroShell::exec <Token::paula, Token::audio> (Arguments& argv, long param)
-{
-    dumpSummary(amiga.paula.muxer);
-}
-
-template <> void
-RetroShell::exec <Token::paula, Token::audio, Token::debug> (Arguments& argv, long param)
-{
-    dumpDetails(amiga.paula.muxer);
-}
-
-template <> void
-RetroShell::exec <Token::paula, Token::dc> (Arguments& argv, long param)
-{
-    dumpSummary(amiga.paula.diskController);
-}
-
-template <> void
-RetroShell::exec <Token::paula, Token::dc, Token::debug> (Arguments& argv, long param)
-{
-    dumpDetails(amiga.paula.diskController);
-}
-
-template <> void
-RetroShell::exec <Token::paula, Token::uart> (Arguments& argv, long param)
-{
-    dumpSummary(amiga.paula.uart);
-}
-
-
-//
-// Denise
-//
-
-template <> void
-RetroShell::exec <Token::denise> (Arguments &argv, long param)
-{
-    dumpSummary(denise);
-}
-
-template <> void
-RetroShell::exec <Token::denise, Token::debug> (Arguments &argv, long param)
-{
-    dumpDetails(denise);
-}
-
-
-//
-// RTC
-//
-
-template <> void
-RetroShell::exec <Token::rtc> (Arguments &argv, long param)
-{
-    dumpSummary(rtc);
-}
-
-template <> void
-RetroShell::exec <Token::rtc, Token::debug> (Arguments &argv, long param)
-{
-    dumpDetails(rtc);
-}
-
-
-//
-// Control ports
-//
-
-template <> void
-RetroShell::exec <Token::controlport> (Arguments& argv, long param)
-{
-    if (param == 1) dumpSummary(amiga.controlPort1);
-    if (param == 2) dumpSummary(amiga.controlPort2);
-}
-
-template <> void
-RetroShell::exec <Token::controlport, Token::debug> (Arguments& argv, long param)
-{
-    if (param == 1) dumpDetails(amiga.controlPort1);
-    if (param == 2) dumpDetails(amiga.controlPort2);
-}
-
-
-//
-// Serial port
-//
-
-template <> void
-RetroShell::exec <Token::serial> (Arguments& argv, long param)
-{
-    dumpSummary(amiga.serialPort);
-}
-
-
-//
-// Keyboard, Mice, Joysticks
-//
-
-template <> void
-RetroShell::exec <Token::keyboard> (Arguments& argv, long param)
-{
-    dumpSummary(amiga.keyboard);
-}
-
-template <> void
-RetroShell::exec <Token::mouse> (Arguments& argv, long param)
-{
-    if (param == 1) dumpSummary(amiga.controlPort1.mouse);
-    if (param == 2) dumpSummary(amiga.controlPort2.mouse);
-}
-
-template <> void
-RetroShell::exec <Token::mouse, Token::debug> (Arguments& argv, long param)
-{
-    if (param == 1) dumpDetails(amiga.controlPort1.mouse);
-    if (param == 2) dumpDetails(amiga.controlPort2.mouse);
-}
-
-template <> void
-RetroShell::exec <Token::joystick> (Arguments& argv, long param)
-{
-    if (param == 1) dumpSummary(amiga.controlPort1.joystick);
-    if (param == 2) dumpSummary(amiga.controlPort2.joystick);
-}
-
-
-//
-// Df0, Df1, Df2, Df3
-//
-
-template <> void
-RetroShell::exec <Token::dfn> (Arguments& argv, long param)
-{
-    dumpSummary(*amiga.df[param]);
-}
-
-template <> void
-RetroShell::exec <Token::dfn, Token::debug> (Arguments& argv, long param)
-{
-    dumpDetails(*amiga.df[param]);
-}
-
-template <> void
-RetroShell::exec <Token::dfn, Token::disk> (Arguments& argv, long param)
-{
-    dump(*amiga.df[param], Category::Disk);
-}
-
-
-//
-// Hd0, Hd1, Hd2, Hd3
-//
-
-template <> void
-RetroShell::exec <Token::hdn, Token::drive> (Arguments& argv, long param)
-{
-    dump(*amiga.hd[param], Category::Drive);
-}
-
-template <> void
-RetroShell::exec <Token::hdn, Token::volumes> (Arguments& argv, long param)
-{
-    dump(*amiga.hd[param], Category::Volumes);
-}
-
-template <> void
-RetroShell::exec <Token::hdn, Token::partition> (Arguments& argv, long param)
-{
-    dump(*amiga.hd[param], Category::Partitions);
-}
-
-template <> void
-RetroShell::exec <Token::hdn, Token::debug> (Arguments& argv, long param)
-{
-    dumpDetails(*amiga.hd[param]);
-}
-
-
-//
-// OSDebugger
-//
-
-template <> void
-RetroShell::exec <Token::os, Token::info> (Arguments& argv, long param)
-{
-    std::stringstream ss;
-    osDebugger.dumpInfo(ss);
-
-    *this << ss;
-}
-
-template <> void
-RetroShell::exec <Token::os, Token::execbase> (Arguments& argv, long param)
-{
-    std::stringstream ss;
-    osDebugger.dumpExecBase(ss);
-
-    *this << ss;
-}
-
-template <> void
-RetroShell::exec <Token::os, Token::interrupts> (Arguments& argv, long param)
-{
-    std::stringstream ss;
-    osDebugger.dumpIntVectors(ss);
-
-    *this << ss;
-}
-
-template <> void
-RetroShell::exec <Token::os, Token::libraries> (Arguments& argv, long param)
-{
-    std::stringstream ss;
-    isize num;
-
-    if (argv.empty()) {
-        osDebugger.dumpLibraries(ss);
-    } else if (util::parseHex(argv.front(), &num)) {
-        osDebugger.dumpLibrary(ss, (u32)num);
-    } else {
-        osDebugger.dumpLibrary(ss, argv.front());
-    }
-
-    *this << ss;
-}
-
-template <> void
-RetroShell::exec <Token::os, Token::devices> (Arguments& argv, long param)
-{
-    std::stringstream ss;
-    isize num;
-
-    if (argv.empty()) {
-        osDebugger.dumpDevices(ss);
-    } else if (util::parseHex(argv.front(), &num)) {
-        osDebugger.dumpDevice(ss, (u32)num);
-    } else {
-        osDebugger.dumpDevice(ss, argv.front());
-    }
-
-    *this << ss;
-}
-
-template <> void
-RetroShell::exec <Token::os, Token::resources> (Arguments& argv, long param)
-{
-    std::stringstream ss;
-    isize num;
-
-    if (argv.empty()) {
-        osDebugger.dumpResources(ss);
-    } else if (util::parseHex(argv.front(), &num)) {
-        osDebugger.dumpResource(ss, (u32)num);
-    } else {
-        osDebugger.dumpResource(ss, argv.front());
-    }
-
-    *this << ss;
-}
-
-template <> void
-RetroShell::exec <Token::os, Token::tasks> (Arguments& argv, long param)
-{
-    std::stringstream ss;
-    isize num;
-
-    if (argv.empty()) {
-        osDebugger.dumpTasks(ss);
-    } else if (util::parseHex(argv.front(), &num)) {
-        osDebugger.dumpTask(ss, (u32)num);
-    } else {
-        osDebugger.dumpTask(ss, argv.front());
-    }
-
-    *this << ss;
-}
-
-template <> void
-RetroShell::exec <Token::os, Token::processes> (Arguments& argv, long param)
-{
-    std::stringstream ss;
-    isize num;
-
-    if (argv.empty()) {
-        osDebugger.dumpProcesses(ss);
-    } else if (util::parseHex(argv.front(), &num)) {
-        osDebugger.dumpProcess(ss, (u32)num);
-    } else {
-        osDebugger.dumpProcess(ss, argv.front());
-    }
-
-    *this << ss;
-}
-
-template <> void
-RetroShell::exec <Token::os, Token::cp> (Arguments& argv, long param)
-{
-    diagBoard.catchTask(argv.back());
-    *this << "Waiting for task '" << argv.back() << "' to start...\n";
-}
-
-template <> void
-RetroShell::exec <Token::os, Token::set, Token::diagboard> (Arguments& argv, long param)
-{
-    diagBoard.setConfigItem(OPT_DIAG_BOARD, util::parseBool(argv.front()));
-}
-
-}
diff --git a/Emulator/RetroShell/RetroShellTypes.h b/Emulator/RetroShell/RetroShellTypes.h
index be036b891..e678f57dd 100644
--- a/Emulator/RetroShell/RetroShellTypes.h
+++ b/Emulator/RetroShell/RetroShellTypes.h
@@ -23,6 +23,7 @@ enum_long(RETRO_SHELL_KEY)
     RSKEY_LEFT,
     RSKEY_RIGHT,
     RSKEY_DEL,
+    RSKEY_CUT,
     RSKEY_BACKSPACE,
     RSKEY_HOME,
     RSKEY_END,
@@ -49,6 +50,7 @@ struct RetroShellKeyEnum : util::Reflection<RetroShellKeyEnum, RetroShellKey>
             case RSKEY_LEFT:        return "LEFT";
             case RSKEY_RIGHT:       return "RIGHT";
             case RSKEY_DEL:         return "DEL";
+            case RSKEY_CUT:         return "CUT";
             case RSKEY_BACKSPACE:   return "BACKSPACE";
             case RSKEY_HOME:        return "HOME";
             case RSKEY_END:         return "END";
diff --git a/Emulator/RetroShell/TextStorage.cpp b/Emulator/RetroShell/TextStorage.cpp
index bf043b600..1594c79f6 100644
--- a/Emulator/RetroShell/TextStorage.cpp
+++ b/Emulator/RetroShell/TextStorage.cpp
@@ -98,24 +98,4 @@ TextStorage::operator<<(std::stringstream &ss)
     return *this;
 }
 
-/*
-void
-TextStorage::welcome()
-{
-    *this << "vAmiga Retro Shell " << Amiga::build() << '\n';
-    *this << '\n';
-    *this << "Copyright (C) Dirk W. Hoffmann. www.dirkwhoffmann.de" << '\n';
-    *this << "Licensed under the GNU General Public License v3" << '\n';
-    *this << '\n';
-    printHelp();
-    *this << '\n';
-}
-
-void
-TextStorage::printHelp()
-{
-    *this << "Type 'help' or press 'TAB' twice for help." << '\n';
-    *this << "Type '.' or press 'SHIFT+RETURN' to enter the debugger." << '\n';
-}
-*/
 }
diff --git a/Emulator/RetroShell/TextStorage.h b/Emulator/RetroShell/TextStorage.h
index a9c61d9fc..1caebeec2 100644
--- a/Emulator/RetroShell/TextStorage.h
+++ b/Emulator/RetroShell/TextStorage.h
@@ -67,14 +67,6 @@ class TextStorage {
     TextStorage &operator<<(char c);
     TextStorage &operator<<(const string &s);
     TextStorage &operator<<(std::stringstream &ss);
-
-    /*
-    // Prints the welcome message
-    void welcome();
-    
-    // Prints the help line
-    void printHelp();
-    */
 };
 
 }
diff --git a/Emulator/SelfTestScript.h b/Emulator/SelfTestScript.h
new file mode 100644
index 000000000..8d063bf68
--- /dev/null
+++ b/Emulator/SelfTestScript.h
@@ -0,0 +1,509 @@
+// -----------------------------------------------------------------------------
+// This file is part of vAmiga
+//
+// Copyright (C) Dirk W. Hoffmann. www.dirkwhoffmann.de
+// Licensed under the GNU General Public License v3
+//
+// See https://www.gnu.org for license information
+// -----------------------------------------------------------------------------
+
+#pragma once
+
+static const char *script[] = {
+
+    "# Self-test script for vAmiga",
+    "# ",
+    "# This script is executed in nightly-builts to check the integrity of ",
+    "# the compiled application. It runs several shell commands to check if ",
+    "# anything breaks.",
+    "# ",
+    "# Dirk W. Hoffmann, 2023",
+
+    "",
+    "help",
+    "hel",          // Test auto-completion
+    "joshua",       // Test a hidden command
+    "try joshu",    // Catch an error with 'try'
+
+    "",
+    "regression setup A1000_OCS_1MB",
+    "regression setup A500_OCS_1MB",
+    "regression setup A500_ECS_1MB",
+    "regression setup A500_PLUS_1MB",
+
+    "",
+    "amiga",
+    "amiga defaults",
+    "amiga set type PAL",
+    "amiga set type NTSC",
+    "amiga set fps 50",
+    "amiga set fps 60",
+    "amiga init A1000_OCS_1MB",
+    "amiga init A500_OCS_1MB",
+    "amiga init A500_ECS_1MB",
+    "amiga init A500_PLUS_1MB",
+    "amiga power off",
+    "amiga reset",
+
+    "",
+    "memory",
+    "memory set chip 256",
+    "memory set chip 512",
+    "memory set chip 1024",
+    "memory set slow 0",
+    "memory set slow 512",
+    "memory set fast 0",
+    "memory set fast 256",
+    "memory set fast 512",
+    "memory set fast 1024",
+    "memory set fast 2048",
+    "memory set fast 4096",
+    "memory set fast 8192",
+    "memory set extstart 0xE0",
+    "memory set extstart 0xF0",
+    "memory set saveroms true",
+    "memory set saveroms false",
+    "memory set slowramdelay true",
+    "memory set slowramdelay false",
+    "memory set bankmap A500",
+    "memory set bankmap A1000",
+    "memory set bankmap A2000A",
+    "memory set bankmap A2000B",
+    "memory set raminit ALL_ZEROES",
+    "memory set raminit ALL_ONES",
+    "memory set raminit RANDOMIZED",
+    "memory set unmapped FLOATING",
+    "memory set unmapped ALL_ZEROES",
+    "memory set unmapped ALL_ONES",
+
+    "",
+    "cpu",
+    "cpu set revision 68000",
+    "cpu set revision 68010",
+    "cpu set revision 68EC020",
+    "cpu set dasm revision 68000",
+    "cpu set dasm revision 68010",
+    "cpu set dasm revision 68EC020",
+    "cpu set dasm revision 68020",
+    "cpu set dasm revision 68EC030",
+    "cpu set dasm revision 68030",
+    "cpu set dasm revision 68EC040",
+    "cpu set dasm revision 68LC040",
+    "cpu set dasm revision 68040",
+    "cpu set dasm syntax MOIRA",
+    "cpu set dasm syntax MOIRA_MIT",
+    "cpu set dasm syntax GNU",
+    "cpu set dasm syntax GNU_MIT",
+    "cpu set dasm syntax MUSASHI",
+    "cpu set overclocking 0",
+    "cpu set overclocking 1",
+    "cpu set overclocking 2",
+    "cpu set regreset 0",
+
+    "",
+    "ciaa",
+    "ciaa set revision MOS_8520_DIP",
+    "ciaa set revision MOS_8520_PLCC",
+    "ciaa set todbug true",
+    "ciaa set todbug false",
+    "ciaa set esync true",
+    "ciaa set esync false",
+    "ciab",
+
+    "",
+    "ciab set revision MOS_8520_DIP",
+    "ciab set revision MOS_8520_PLCC",
+    "ciab set todbug true",
+    "ciab set todbug false",
+    "ciab set esync true",
+    "ciab set esync false",
+
+    "",
+    "agnus",
+    "agnus set revision OCS_OLD",
+    "agnus set revision OCS",
+    "agnus set revision ECS_1MB",
+    "agnus set revision ECS_2MB",
+    "agnus set slowrammirror true",
+    "agnus set slowrammirror false",
+    "agnus set ptrdrops true",
+    "agnus set ptrdrops false",
+
+    "blitter",
+    "blitter set accuracy 0",
+    "blitter set accuracy 1",
+    "blitter set accuracy 2",
+
+    "denise",
+    "denise set revision OCS",
+    "denise set revision ECS",
+    "denise set tracking true",
+    "denise set tracking false",
+    "denise set clxsprspr true",
+    "denise set clxsprspr false",
+    "denise set clxsprplf true",
+    "denise set clxsprplf false",
+    "denise set clxplfplf true",
+    "denise set clxplfplf false",
+    "denise set hidden bitplanes 0",
+    "denise set hidden bitplanes 0xFF",
+    "denise set hidden sprites 0",
+    "denise set hidden sprites 0xFF",
+    "denise set hidden layers 0",
+    "denise set hidden layers 0xFF",
+
+    "dmadebugger open",
+    "dmadebugger close",
+    "dmadebugger copper true",
+    "dmadebugger copper false",
+    "dmadebugger blitter true",
+    "dmadebugger blitter false",
+    "dmadebugger disk true",
+    "dmadebugger disk false",
+    "dmadebugger audio true",
+    "dmadebugger audio false",
+    "dmadebugger sprites true",
+    "dmadebugger sprites false",
+    "dmadebugger bitplanes true",
+    "dmadebugger bitplanes false",
+    "dmadebugger cpu true",
+    "dmadebugger cpu false",
+    "dmadebugger refresh true",
+    "dmadebugger refresh false",
+
+    "monitor",
+    "monitor set palette COLOR",
+    "monitor set palette BLACK_WHITE",
+    "monitor set palette PAPER_WHITE",
+    "monitor set palette GREEN",
+    "monitor set palette AMBER",
+    "monitor set palette SEPIA",
+    "monitor set brightness 50",
+    "monitor set contrast 50",
+    "monitor set saturation 50",
+
+    "paula audio",
+    "paula audio filter",
+    "paula audio filter set type NONE",
+    "paula audio filter set type BUTTERWORTH",
+    "paula audio filter set activation AUTO_ENABLE",
+    "paula audio filter set activation ALWAYS_ON",
+    "paula audio filter set activation ALWAYS_OFF",
+    "paula audio set sampling NONE",
+    "paula audio set sampling NEAREST",
+    "paula audio set sampling LINEAR",
+    "paula audio set volume channel0 50",
+    "paula audio set volume channel1 50",
+    "paula audio set volume channel2 50",
+    "paula audio set volume channel3 50",
+    "paula audio set volume left 50",
+    "paula audio set volume right 50",
+    "paula audio set pan channel0 50",
+    "paula audio set pan channel1 50",
+    "paula audio set pan channel2 50",
+    "paula audio set pan channel3 50",
+
+    "paula dc",
+    "paula dc set speed 2",
+    "paula dc dsksync auto true",
+    "paula dc dsksync auto false",
+    "paula dc dsksync lock true",
+    "paula dc dsksync lock false",
+
+    "rtc",
+    "rtc set revision NONE",
+    "rtc set revision OKI",
+    "rtc set revision RICOH",
+
+    "keyboard",
+    "keyboard set accuracy 0",
+    "keyboard set accuracy 1",
+    "keyboard press 32",
+
+    "joystick 1",
+    "joystick 1 set autofire true",
+    "joystick 1 set autofire false",
+    "joystick 1 set bullets 10",
+    "joystick 1 set delay 10",
+    "joystick 1 press 1",
+    "joystick 1 press 2",
+    "joystick 1 press 3",
+    "joystick 1 unpress 1",
+    "joystick 1 unpress 2",
+    "joystick 1 unpress 3",
+    "joystick 1 pull left",
+    "joystick 1 pull right",
+    "joystick 1 pull up",
+    "joystick 1 pull down",
+    "joystick 1 release x",
+    "joystick 1 release y",
+
+    "joystick 2",
+    "joystick 2 set autofire true",
+    "joystick 2 set autofire false",
+    "joystick 2 set bullets 10",
+    "joystick 2 set delay 10",
+    "joystick 2 press 1",
+    "joystick 2 press 2",
+    "joystick 2 press 3",
+    "joystick 2 unpress 1",
+    "joystick 2 unpress 2",
+    "joystick 2 unpress 3",
+    "joystick 2 pull left",
+    "joystick 2 pull right",
+    "joystick 2 pull up",
+    "joystick 2 pull down",
+    "joystick 2 release x",
+    "joystick 2 release y",
+
+    "mouse 1",
+    "mouse 1 set pullup true",
+    "mouse 1 set pullup false",
+    "mouse 1 set shakedetector true",
+    "mouse 1 set shakedetector false",
+    "mouse 1 set velocity 50",
+    "mouse 1 press left",
+    "mouse 1 press middle",
+    "mouse 1 press right",
+
+    "mouse 2",
+    "mouse 2 set pullup true",
+    "mouse 2 set pullup false",
+    "mouse 2 set shakedetector true",
+    "mouse 2 set shakedetector false",
+    "mouse 2 set velocity 50",
+    "mouse 2 press left",
+    "mouse 2 press middle",
+    "mouse 2 press right",
+
+    "serial",
+    "serial set device NONE",
+    "serial set device NULLMODEM",
+    "serial set device LOOPBACK",
+
+    "df0",
+    "df0 eject",
+    "df0 set model DD_35",
+    "df0 set rpm 300",
+    "df0 set mechanics NONE",
+    "df0 set mechanics A1010",
+    "df0 set searchpath \"tmp/\"",
+    "df0 set swapdelay 2",
+    "df0 set pan 50",
+    "df0 audiate insert 50",
+    "df0 audiate eject 50",
+    "df0 audiate step 50",
+    "df0 audiate poll 50",
+
+    "df1 connect",
+    "df1 disconnect",
+    "df1 eject",
+    "df1 set model DD_35",
+    "df1 set rpm 300",
+    "df1 set mechanics NONE",
+    "df1 set mechanics A1010",
+    "df1 set searchpath \"tmp/\"",
+    "df1 set swapdelay 2",
+    "df1 set pan 50",
+    "df1 audiate insert 50",
+    "df1 audiate eject 50",
+    "df1 audiate step 50",
+    "df1 audiate poll 50",
+
+    "hd0",
+    "hd0 disconnect",
+    "hd0 connect",
+    "hd0 set pan 50",
+    "hd0 set geometry 320 2 32",
+    "hd0 audiate step 50",
+
+    "hd1",
+    "hd1 disconnect",
+    "hd1 connect",
+    "hd1 set pan 50",
+    "hd1 set geometry 320 2 32",
+    "hd1 audiate step 50",
+
+    "server",
+    "server serial",
+    "server serial set port 8000",
+    "server serial set verbose true",
+    "server serial set verbose false",
+    "server serial inspect",
+
+    "server rshell",
+    "server rshell set port 8000",
+    "server rshell set verbose true",
+    "server rshell set verbose false",
+    "server rshell inspect",
+
+    "server gdb",
+    "server gdb set port 8000",
+    "server gdb set verbose true",
+    "server gdb set verbose false",
+    "server gdb inspect",
+
+    "",
+    "# Entering the debugger...",
+    ".",
+
+    "",
+    "break",
+    "break at 1024",
+    "break at $A000",
+    "break at 0xB000",
+    "break",
+    "break enable 0",
+    "break disable 1",
+    "break delete 2",
+    "break ignore 0 20",
+    "break",
+
+    "",
+    "watch",
+    "watch at 1024",
+    "watch at $A000",
+    "watch at 0xB000",
+    "watch",
+    "watch enable 0",
+    "watch disable 1",
+    "watch delete 2",
+    "watch ignore 0 20",
+    "watch",
+
+    "catch",
+    "catch vector 12",
+    "catch interrupt 2",
+    "catch trap 12",
+    "catch",
+    "catch enable 0",
+    "catch disable 1",
+    "catch delete 2",
+    "catch ignore 0 20",
+    "catch",
+
+    "cbreak",
+    "cbreak at 1024",
+    "cbreak at $A000",
+    "cbreak at 0xB000",
+    "cbreak",
+    "cbreak enable 0",
+    "cbreak disable 1",
+    "cbreak delete 2",
+    "cbreak ignore 0 20",
+    "cbreak",
+
+    "",
+    "cwatch",
+    "cwatch at 1024",
+    "cwatch at $A000",
+    "cwatch at 0xB000",
+    "cwatch",
+    "cwatch enable 0",
+    "cwatch disable 1",
+    "cwatch delete 2",
+    "cwatch ignore 0 20",
+    "cwatch",
+
+    "",
+    "amiga",
+    "amiga progress",
+    "amiga host",
+    "amiga debug",
+
+    "",
+    "memory",
+    "memory dump $A00000",
+    "memory banks",
+    "memory checksum",
+    "memory write $A00000, $FFFF",
+
+    "",
+    "cpu",
+    "cpu debug",
+    "cpu vectors",
+
+    "",
+    "ciaa",
+    "ciaa debug",
+    "ciaa tod",
+
+    "",
+    "ciab",
+    "ciab debug",
+    "ciab tod",
+
+    "",
+    "agnus",
+    "agnus debug",
+    "agnus beam",
+    "agnus dma",
+    "agnus events",
+
+    "",
+    "blitter",
+    "blitter debug",
+
+    "",
+    "copper",
+    "copper debug",
+    "copper list 1",
+    "copper list 2",
+
+    "",
+    "paula",
+    "paula debug",
+    "paula audio",
+    "paula audio debug",
+    "paula dc",
+    "paula dc debug",
+    "paula uart",
+
+    "",
+    "denise",
+    "denise debug",
+
+    "",
+    "rtc",
+    "rtc debug",
+
+    "",
+    "zorro",
+    "zorro inspect 0",
+    "zorro inspect 1",
+
+    "",
+    "controlport 1",
+    "controlport 1 debug",
+    "controlport 2",
+    "controlport 2 debug",
+
+    "",
+    "serial",
+
+    "",
+    "keyboard",
+
+    "",
+    "mouse 1",
+    "mouse 1 debug",
+    "mouse 2",
+    "mouse 2 debug",
+
+    "",
+    "joystick 1",
+    "joystick 2",
+
+    "df0",
+    "df0 debug",
+    "df0 disk",
+    "df1",
+    "df1 debug",
+    "df1 disk",
+    "df2",
+    "df2 debug",
+    "df2 disk",
+    "df3",
+    "df3 debug",
+    "df3 disk",
+};
diff --git a/Emulator/Utilities/Parser.cpp b/Emulator/Utilities/Parser.cpp
index 525486f6e..ffd0ecc44 100644
--- a/Emulator/Utilities/Parser.cpp
+++ b/Emulator/Utilities/Parser.cpp
@@ -34,6 +34,9 @@ long
 parseNum(string& token)
 {
     long result;
+
+    // Replace leading '$' by '0x'
+    if (!token.empty() && token[0] == '$') token = "0x" + token.erase(0, 1);
     
     try { result = stol(token, nullptr, 0); }
     catch (std::exception&) { throw ParseNumError(token); }
diff --git a/Emulator/Utilities/Parser.h b/Emulator/Utilities/Parser.h
index 5e9baf6ee..aaab88bd6 100644
--- a/Emulator/Utilities/Parser.h
+++ b/Emulator/Utilities/Parser.h
@@ -58,12 +58,4 @@ template <typename Enum> long parseEnum(const string& key)
     return it->second;
 }
 
-/*
- template <typename Enum> long parseEnum(const std::vector<string>& keys)
- {
- assert(keys.size() == 1);
- return parseEnum<Enum>(keys.front());
- }
- */
-
 }
diff --git a/Emulator/Utilities/Reflection.h b/Emulator/Utilities/Reflection.h
index 03aee24a5..91e97bd10 100644
--- a/Emulator/Utilities/Reflection.h
+++ b/Emulator/Utilities/Reflection.h
@@ -56,7 +56,6 @@ template <class T, typename E> struct Reflection {
 
         return "{ " + keyList(prefix, " | ") + " }";
     }
-
 };
 
 }
diff --git a/Emulator/Zorro/DiagBoard.h b/Emulator/Zorro/DiagBoard.h
index d65800199..e101c6cf3 100644
--- a/Emulator/Zorro/DiagBoard.h
+++ b/Emulator/Zorro/DiagBoard.h
@@ -44,7 +44,7 @@ class DiagBoard : public ZorroBoard {
 
 
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 private:
@@ -54,7 +54,7 @@ class DiagBoard : public ZorroBoard {
 
     
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
     
 private:
diff --git a/Emulator/Zorro/HdController.h b/Emulator/Zorro/HdController.h
index e6862deac..f6c06067f 100644
--- a/Emulator/Zorro/HdController.h
+++ b/Emulator/Zorro/HdController.h
@@ -53,7 +53,7 @@ class HdController : public ZorroBoard {
 
 
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 private:
@@ -63,7 +63,7 @@ class HdController : public ZorroBoard {
 
     
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
     
 private:
diff --git a/Emulator/Zorro/RamExpansion.h b/Emulator/Zorro/RamExpansion.h
index 2405fba04..043f0b01f 100644
--- a/Emulator/Zorro/RamExpansion.h
+++ b/Emulator/Zorro/RamExpansion.h
@@ -25,7 +25,7 @@ class RamExpansion : public ZorroBoard {
     
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 private:
@@ -35,7 +35,7 @@ class RamExpansion : public ZorroBoard {
 
     
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
     
 private:
diff --git a/Emulator/Zorro/ZorroBoard.h b/Emulator/Zorro/ZorroBoard.h
index 3275ff48e..240ef91e0 100644
--- a/Emulator/Zorro/ZorroBoard.h
+++ b/Emulator/Zorro/ZorroBoard.h
@@ -37,7 +37,7 @@ class ZorroBoard : public SubComponent {
     
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 protected:
diff --git a/Emulator/Zorro/ZorroManager.h b/Emulator/Zorro/ZorroManager.h
index a58090ba5..6d7c21f49 100644
--- a/Emulator/Zorro/ZorroManager.h
+++ b/Emulator/Zorro/ZorroManager.h
@@ -47,7 +47,7 @@ class ZorroManager : public SubComponent {
     
     
     //
-    // Methods from AmigaObject
+    // Methods from CoreObject
     //
     
 private:
@@ -57,7 +57,7 @@ class ZorroManager : public SubComponent {
 
     
     //
-    // Methods from AmigaComponent
+    // Methods from CoreComponent
     //
     
 private:
diff --git a/Emulator/config.h b/Emulator/config.h
index 81f029365..5da5f7527 100644
--- a/Emulator/config.h
+++ b/Emulator/config.h
@@ -17,13 +17,13 @@
 #define VER_MAJOR 2
 #define VER_MINOR 3
 #define VER_SUBMINOR 0
-#define VER_BETA 1
+#define VER_BETA 0
 
 // Snapshot version number
 #define SNP_MAJOR 2
 #define SNP_MINOR 3
 #define SNP_SUBMINOR 0
-#define SNP_BETA 1
+#define SNP_BETA 0
 
 // Uncomment this setting in a release build
 #define RELEASEBUILD
diff --git a/GUI/Defaults.swift b/GUI/Defaults.swift
index b30860dfb..2299adcde 100644
--- a/GUI/Defaults.swift
+++ b/GUI/Defaults.swift
@@ -1292,7 +1292,8 @@ extension Configuration {
 
         amiga.suspend()
 
-        defaults.set(.VSYNC, vsync)
+        defaults.set(.SYNC_MODE, syncMode)
+        defaults.set(.PROPOSED_FPS, proposedFps)
 
         saveColorUserDefaults()
         saveGeometryUserDefaults()
diff --git a/GUI/Dialogs/Configuration/Configuration.swift b/GUI/Dialogs/Configuration/Configuration.swift
index d29b79154..1dceb136f 100644
--- a/GUI/Dialogs/Configuration/Configuration.swift
+++ b/GUI/Dialogs/Configuration/Configuration.swift
@@ -433,9 +433,13 @@ class Configuration {
     // Video settings
     //
 
-    var vsync: Bool {
-        get { return amiga.getConfig(.VSYNC) != 0 }
-        set { amiga.configure(.VSYNC, enable: newValue) }
+    var syncMode: Int {
+        get { return amiga.getConfig(.SYNC_MODE) }
+        set { amiga.configure(.SYNC_MODE, value: newValue) }
+    }
+    var proposedFps: Int {
+        get { return amiga.getConfig(.PROPOSED_FPS) }
+        set { amiga.configure(.PROPOSED_FPS, value: newValue) }
     }
     var palette: Int {
         get { return amiga.getConfig(.PALETTE) }
diff --git a/GUI/Dialogs/Configuration/ConfigurationController.swift b/GUI/Dialogs/Configuration/ConfigurationController.swift
index d3fb077b3..8a39be552 100644
--- a/GUI/Dialogs/Configuration/ConfigurationController.swift
+++ b/GUI/Dialogs/Configuration/ConfigurationController.swift
@@ -16,7 +16,7 @@ class ConfigurationController: DialogController {
     @IBOutlet weak var prefTabView: NSTabView!
         
     //
-    // Rom preferences
+    // Roms
     //
         
     // Rom info
@@ -52,7 +52,7 @@ class ConfigurationController: DialogController {
     @IBOutlet weak var romPowerButton: NSButton!
 
     //
-    // Chipset preferences
+    // Chipset
     //
     
     // CPU
@@ -94,7 +94,7 @@ class ConfigurationController: DialogController {
     @IBOutlet weak var csPowerButton: NSButton!
 
     //
-    // Memory preferences
+    // Memory
     //
     
     // RAM
@@ -125,7 +125,7 @@ class ConfigurationController: DialogController {
     @IBOutlet weak var memPowerButton: NSButton!
 
     //
-    // Peripherals preferences
+    // Peripherals
     //
 
     // Flopp drives
@@ -165,7 +165,7 @@ class ConfigurationController: DialogController {
     @IBOutlet weak var perPowerButton: NSButton!
 
     //
-    // Compatibility preferences
+    // Compatibility
     //
 
     // Graphics
@@ -199,7 +199,7 @@ class ConfigurationController: DialogController {
     @IBOutlet weak var compPowerButton: NSButton!
     
     //
-    // Audio preferences
+    // Audio
     //
     
     // In
@@ -240,7 +240,7 @@ class ConfigurationController: DialogController {
     @IBOutlet weak var audPowerButton: NSButton!
 
     //
-    // Video preferences
+    // Video
     //
     
     // Palette
@@ -261,8 +261,11 @@ class ConfigurationController: DialogController {
     @IBOutlet weak var vidHCenterLabel: NSTextField!
     @IBOutlet weak var vidVCenterLabel: NSTextField!
 
-    // Oscillator
-    @IBOutlet weak var vidVsync: NSButton!
+    // Frame rate
+    @IBOutlet weak var vidSyncMode: NSPopUpButton!
+    @IBOutlet weak var vidFpsSlider: NSSlider!
+    @IBOutlet weak var vidFpsMin: NSTextField!
+    @IBOutlet weak var vidFpsMax: NSTextField!
 
     // Effects
     @IBOutlet weak var vidEnhancerPopUp: NSPopUpButton!
diff --git a/GUI/Dialogs/Configuration/VideoConf.swift b/GUI/Dialogs/Configuration/VideoConf.swift
index d1c15478b..f435660ad 100644
--- a/GUI/Dialogs/Configuration/VideoConf.swift
+++ b/GUI/Dialogs/Configuration/VideoConf.swift
@@ -57,8 +57,15 @@ extension ConfigurationController {
         vidHCenterLabel.textColor = config.center == 0 ? .labelColor : .disabledControlTextColor
         vidVCenterLabel.textColor = config.center == 0 ? .labelColor : .disabledControlTextColor
 
-        // Vsync
-        vidVsync.state = config.vsync ? .on : .off
+        // Frame rate
+        let syncMode = config.syncMode
+        let fps = config.proposedFps
+        vidSyncMode.item(at: 1)?.title = "Fixed (\(fps) fps)"
+        vidSyncMode.selectItem(withTag: syncMode)
+        vidFpsSlider.integerValue = fps
+        vidFpsSlider.isHidden = syncMode != 1
+        vidFpsMin.isHidden = syncMode != 1
+        vidFpsMax.isHidden = syncMode != 1
 
         // Upscalers
         vidEnhancerPopUp.selectItem(withTag: config.enhancer)
@@ -180,19 +187,24 @@ extension ConfigurationController {
     @IBAction func vidVCenterAction(_ sender: NSSlider!) {
 
         let value = sender.floatValue / 1000
-        debug(.config, "vCenter = \(value)")
 
         config.vCenter = value
         refresh()
     }
 
     //
-    // Action methods (Display)
+    // Action methods (Refresh rate)
     //
 
-    @IBAction func vidVsyncAction(_ sender: NSButton!) {
+    @IBAction func vidSyncModeAction(_ sender: NSPopUpButton!) {
 
-        config.vsync = sender.state == .on
+        config.syncMode = sender.selectedTag()
+        refresh()
+    }
+
+    @IBAction func vidFpsAction(_ sender: NSSlider!) {
+
+        config.proposedFps = sender.integerValue
         refresh()
     }
 
diff --git a/GUI/Dialogs/Inspector/Inspector.swift b/GUI/Dialogs/Inspector/Inspector.swift
index 8ef4caa87..7e66b9558 100644
--- a/GUI/Dialogs/Inspector/Inspector.swift
+++ b/GUI/Dialogs/Inspector/Inspector.swift
@@ -807,16 +807,16 @@ extension Inspector: NSTabViewDelegate {
 
             switch id {
 
-            case "CPU":     parent?.amiga.inspectionTarget = .CPU
-            case "CIA":     parent?.amiga.inspectionTarget = .CIA
-            case "Memory":  parent?.amiga.inspectionTarget = .MEM
-            case "Agnus":   parent?.amiga.inspectionTarget = .AGNUS
-            case "Copper":  parent?.amiga.inspectionTarget = .AGNUS
-            case "Blitter": parent?.amiga.inspectionTarget = .AGNUS
-            case "Denise":  parent?.amiga.inspectionTarget = .DENISE
-            case "Paula":   parent?.amiga.inspectionTarget = .PAULA
-            case "Ports":   parent?.amiga.inspectionTarget = .PORTS
-            case "Events":  parent?.amiga.inspectionTarget = .EVENTS
+            case "CPU":     amiga.inspectionTarget = .CPU
+            case "CIA":     amiga.inspectionTarget = .CIA
+            case "Memory":  amiga.inspectionTarget = .MEM
+            case "Agnus":   amiga.inspectionTarget = .AGNUS
+            case "Copper":  amiga.inspectionTarget = .AGNUS
+            case "Blitter": amiga.inspectionTarget = .AGNUS
+            case "Denise":  amiga.inspectionTarget = .DENISE
+            case "Paula":   amiga.inspectionTarget = .PAULA
+            case "Ports":   amiga.inspectionTarget = .PORTS
+            case "Events":  amiga.inspectionTarget = .EVENTS
             default:        break
             }
             
diff --git a/GUI/Dialogs/Inspector/InstrTableView.swift b/GUI/Dialogs/Inspector/InstrTableView.swift
index 02a57f7f6..5e1b5f8f4 100644
--- a/GUI/Dialogs/Inspector/InstrTableView.swift
+++ b/GUI/Dialogs/Inspector/InstrTableView.swift
@@ -29,6 +29,7 @@ class InstrTableView: NSTableView {
     var numRows = 0
     var bpInRow: [Int: BreakpointType] = [:]
     var addrInRow: [Int: Int] = [:]
+    var addrStrInRow: [Int: String] = [:]
     var dataInRow: [Int: String] = [:]
     var instrInRow: [Int: String] = [:]
     var rowForAddr: [Int: Int] = [:]
@@ -73,6 +74,7 @@ class InstrTableView: NSTableView {
             }
             
             addrInRow[i] = addr
+            addrStrInRow[i] = cpu.disassembleAddr(addr)
             rowForAddr[addr] = i
             addr += bytes
         }
@@ -188,7 +190,7 @@ extension InstrTableView: NSTableViewDataSource {
         case "break" where bpInRow[row] == .disabled:
             return "\u{26AA}" // "⚪" ("\u{2B55}" // "⭕")
         case "addr":
-            return addrInRow[row]
+            return addrStrInRow[row]
         case "data":
             return dataInRow[row]
         case "instr":
diff --git a/GUI/Dialogs/Preferences/DeviceDatabase.swift b/GUI/Dialogs/Preferences/DeviceDatabase.swift
index ab862c696..f888f4173 100644
--- a/GUI/Dialogs/Preferences/DeviceDatabase.swift
+++ b/GUI/Dialogs/Preferences/DeviceDatabase.swift
@@ -62,16 +62,16 @@ class DeviceDatabase {
         if let obj = defaults.object(forKey: Keys.Dev.schemes) as? DeviceDescription {
             custom = obj
         }
-        
-        // track("\(custom)")
     }
     
     func save() {
         
+        debug(.hid)
+        
         let defaults = UserDefaults.standard
         defaults.set(custom, forKey: Keys.Dev.schemes)
         
-        // track("\(custom)")
+        debug(.hid, "\(custom)")
     }
     
     //
@@ -157,18 +157,15 @@ class DeviceDatabase {
     func setLeft(vendorID: String, productID: String, _ value: String?) {
         
         replace(vendorID, productID, "L", value)
-        // track("\(custom)")
     }
 
     func setRight(vendorID: String, productID: String, _ value: String?) {
         
         replace(vendorID, productID, "R", value)
-        // track("\(custom)")
     }
 
     func setHatSwitch(vendorID: String, productID: String, _ value: String?) {
         
         replace(vendorID, productID, "H", value)
-        // track("\(custom)")
     }
 }
diff --git a/GUI/Dialogs/Preferences/Preferences.swift b/GUI/Dialogs/Preferences/Preferences.swift
index f9fa25002..bd41ff9b9 100644
--- a/GUI/Dialogs/Preferences/Preferences.swift
+++ b/GUI/Dialogs/Preferences/Preferences.swift
@@ -47,8 +47,8 @@ class Preferences {
     // Screen captures
     var ffmpegPath = "" {
         didSet {
-            for amiga in myAppDelegate.proxies {
-                amiga.recorder.path = ffmpegPath
+            for proxy in myAppDelegate.proxies {
+                proxy.recorder.path = ffmpegPath
             }
         }
     }
diff --git a/GUI/Metal/Layers/Canvas.swift b/GUI/Metal/Layers/Canvas.swift
index b42631bb9..5dd5b1b1e 100644
--- a/GUI/Metal/Layers/Canvas.swift
+++ b/GUI/Metal/Layers/Canvas.swift
@@ -52,7 +52,7 @@ class Canvas: Layer {
     var mergeTexture: MTLTexture! = nil
 
     /* Bloom textures to emulate blooming (512 x 512)
-     * To emulate a bloom effect, the C64 texture is first split into it's
+     * To emulate a bloom effect, the emulator texture is first split into it's
      * R, G, and B parts. Each texture is then run through a Gaussian blur
      * filter with a large radius. These blurred textures are passed into
      * the fragment shader as secondary textures where they are recomposed
@@ -240,46 +240,9 @@ class Canvas: Layer {
     override func update(frames: Int64) {
             
         super.update(frames: frames)
+        updateTexture()
     }
 
-    // EXPERIMENTAL
-    /*
-    func grabFrameBuffer() {
-
-        let rect = renderer.recordingRect
-        let size = NSSize(width: rect.width, height: rect.height)
-
-        if let gpuData = amiga.recorder.getGpuData(size) {
-
-            let width = Int(rect.width)
-            let height = Int(rect.height)
-
-            switch renderer.prefs.captureSource {
-
-            case .emulatorTexture:
-
-                // blitTexture(texture: mergeTexture) // NOT NEEDED
-                mergeTexture.getBytes(UnsafeMutableRawPointer(mutating: gpuData),
-                                      bytesPerRow: width * 4,
-                                      bytesPerImage: width * height * 4,
-                                      from: MTLRegionMake2D(0, 0, width, height),
-                                      mipmapLevel: 0,
-                                      slice: 0)
-
-            case .frambufferTexture:
-
-                blitTexture(texture: framebufTexture) // NOT NEEDED
-                framebufTexture.getBytes(UnsafeMutableRawPointer(mutating: gpuData),
-                                         bytesPerRow: width * 4,
-                                         bytesPerImage: width * height * 4,
-                                         from: MTLRegionMake2D(0, 0, width, height),
-                                         mipmapLevel: 0,
-                                         slice: 0)
-            }
-        }
-    }
-    */
-
     func updateTexture() {
         
         precondition(lfTexture != nil)
@@ -304,8 +267,9 @@ class Canvas: Layer {
         } else {
 
             // Get the emulator texture
-            let buffer = amiga.denise.stableBuffer!
-            let nr = amiga.denise.frameNr
+            var buffer: UnsafeMutablePointer<u32>!
+            var nr = 0
+            amiga.denise.getStableBuffer(&buffer, nr: &nr, lof: &currLOF, prevlof: &prevLOF)
 
             // Check for duplicate frames or frame drops
             if nr != prevNr + 1 {
@@ -317,13 +281,6 @@ class Canvas: Layer {
             }
             prevNr = nr
 
-            // Determine if the new texture is a long frame or a short frame
-            prevLOF = currLOF
-            currLOF = amiga.denise.longFrame
-
-            // Experimental (copy GPU texture back to emulator)
-            // grabFrameBuffer()
-
             // Update the GPU texture
             if currLOF {
                 lfTexture.replace(w: Int(TPP * HPIXELS), h: Int(VPIXELS), buffer: buffer)
diff --git a/GUI/Metal/Layers/Console.swift b/GUI/Metal/Layers/Console.swift
index 04c4c294b..6c44a002d 100644
--- a/GUI/Metal/Layers/Console.swift
+++ b/GUI/Metal/Layers/Console.swift
@@ -107,9 +107,13 @@ class Console: Layer {
         
         let macKey = MacKey(event: event)
         let shift  = macKey.modifierFlags.contains(.shift)
+        let ctrl   = macKey.modifierFlags.contains(.control)
 
         switch macKey.keyCode {
-        
+
+        case kVK_ANSI_A where ctrl: amiga.retroShell.pressHome()
+        case kVK_ANSI_E where ctrl: amiga.retroShell.pressEnd()
+        case kVK_ANSI_K where ctrl: amiga.retroShell.pressCut()
         case kVK_UpArrow: amiga.retroShell.pressUp()
         case kVK_DownArrow: amiga.retroShell.pressDown()
         case kVK_LeftArrow: amiga.retroShell.pressLeft()
diff --git a/GUI/Metal/MetalViewEvents.swift b/GUI/Metal/MetalViewEvents.swift
index 7797ca48b..e91e9b1cd 100644
--- a/GUI/Metal/MetalViewEvents.swift
+++ b/GUI/Metal/MetalViewEvents.swift
@@ -163,7 +163,7 @@ public extension MetalView {
         let scaleY = (256.0 * 300.0) / frame.height / 128.0
         let dxdy = NSPoint(x: dx * scaleX, y: dy * scaleY)
         
-        // Report the new location to the Amiga mouse
+        // Report the new location to the mouse
         if mouse2 == nil || event.deviceID != 0 {
             mouse1!.processMouseEvents(delta: dxdy)
         } else {
diff --git a/GUI/Metal/Renderer.swift b/GUI/Metal/Renderer.swift
index c32786425..7c0af91c6 100644
--- a/GUI/Metal/Renderer.swift
+++ b/GUI/Metal/Renderer.swift
@@ -25,9 +25,7 @@ class Renderer: NSObject, MTKViewDelegate {
     
     var prefs: Preferences { return parent.pref }
     var config: Configuration { return parent.config }
-
-    // The current size of framebuffer
-    var drawableSize = CGSize()
+    var amiga: AmigaProxy { return parent.amiga }
 
     // Number of drawn frames since power up
     var frames: Int64 = 0
@@ -226,39 +224,57 @@ class Renderer: NSObject, MTKViewDelegate {
         console.update(frames: frames)
         canvas.update(frames: frames)
         monitors.update(frames: frames)
+        parent.update(frames: frames)
+
+        measureFps(frames: frames)
     }
-    
+
+    func measureFps(frames: Int64) {
+
+        let interval = Int64(10)
+
+        if frames % interval == 0 {
+
+            let now = CACurrentMediaTime()
+            let elapsed = now - timestamp
+            timestamp = now
+
+            let newfps = Int(round(Double(interval) / elapsed))
+            if newfps != fps {
+
+                fps = newfps
+                parent.amiga.host.refreshRate = Int(fps)
+                debug(.vsync, "New GPU frame rate: \(fps)")
+            }
+        }
+    }
+
     //
     // Methods from MTKViewDelegate
     //
 
     func mtkView(_ view: MTKView, drawableSizeWillChange size: CGSize) {
 
-        drawableSize = size
         parent.amiga.host.frameBufferSize = size
         reshape(withSize: size)
     }
 
-    var theDrawable: CAMetalDrawable? 
-
     func draw(in view: MTKView) {
         
         frames += 1
         update(frames: frames)
 
         semaphore.wait()
-        canvas.updateTexture()
         parent.amiga.wakeUp()
         
         if let drawable = metalLayer.nextDrawable() {
 
-            theDrawable = drawable
-
             // Create the command buffer
             let buffer = makeCommandBuffer()
             
             // Create the command encoder
-            guard let encoder = makeCommandEncoder(theDrawable!, buffer) else {
+            guard let encoder = makeCommandEncoder(drawable, buffer) else {
+
                 semaphore.signal()
                 return
             }
@@ -274,26 +290,5 @@ class Renderer: NSObject, MTKViewDelegate {
             buffer.present(drawable)
             buffer.commit()
         }
-        
-        // Perform periodic events inside the controller
-        if frames % 5 == 0 {
-
-            parent.timerFunc()
-
-            if frames % 10 == 0 {
-
-                let now = CACurrentMediaTime()
-                let elapsed = now - timestamp
-                timestamp = now
-
-                let newfps = Int(round(10.0 / elapsed))
-                if newfps != fps {
-
-                    fps = newfps
-                    parent.amiga.host.refreshRate = Int(fps)
-                    debug(.vsync, "New GPU frame rate: \(fps)")
-                }
-            }
-        }
     }
 }
diff --git a/GUI/MyApplication.swift b/GUI/MyApplication.swift
index 09b708f26..d0ff37cdb 100644
--- a/GUI/MyApplication.swift
+++ b/GUI/MyApplication.swift
@@ -20,8 +20,8 @@ class MyApplication: NSApplication {
      *
      * Like for all other secondary keys (Control, Option, etc.), function
      * 'flagsChanged' is invoked when the Command key is pressed or released.
-     * However, this method is called too late in the command chain to intercept,
-     * i.e., menu actions will already be carried out.
+     * However, this method is called too late in the command chain to
+     * intercept, i.e., menu actions will already be carried out.
      *
      * The solution taken here is to override function sendEvent in the
      * Application class. This delegation function is called early enough in
diff --git a/GUI/MyController.swift b/GUI/MyController.swift
index 62e8c4296..238c0880e 100644
--- a/GUI/MyController.swift
+++ b/GUI/MyController.swift
@@ -65,10 +65,7 @@ class MyController: NSWindowController, MessageReceiver {
     
     // Speedometer to measure clock frequence and frames per second
     var speedometer: Speedometer!
-    
-    // Used inside the timer function to fine tune timed events
-    var animationCounter = 0
-    
+
     // Remembers if audio is muted (master volume of both channels is 0)
     var muted = false
     
@@ -273,22 +270,23 @@ extension MyController {
     // Timer and message processing
     //
     
-    func timerFunc() {
-        
-        animationCounter += 1
-        
-        // Animate the inspector
-        if inspector?.window?.isVisible == true { inspector!.continuousRefresh() }
+    func update(frames: Int64) {
+
+        if frames % 5 == 0 {
+
+            // Animate the inspector
+            if inspector?.window?.isVisible == true { inspector!.continuousRefresh() }
+        }
         
         // Do less times...
-        if (animationCounter % 3) == 0 {
+        if frames % 16 == 0 {
             
             updateSpeedometer()
             updateMonitoringPanels()
         }
         
         // Do lesser times...
-        if (animationCounter % 32) == 0 {
+        if frames % 256 == 0 {
             
             // Let the cursor disappear in fullscreen mode
             if renderer.fullscreen &&
@@ -469,8 +467,8 @@ extension MyController {
 
         case .OVERCLOCKING:
             speedometer.acceleration = acceleration
-            activityBar.maxValue = 140.0 * acceleration
-            activityBar.warningValue = 77.0 * acceleration
+            activityBar.maxValue = 140.0 * acceleration // TODO: REMOVE??
+            activityBar.warningValue = 77.0 * acceleration 
             activityBar.criticalValue = 105.0 * acceleration
 
         case .BREAKPOINT_UPDATED, .WATCHPOINT_UPDATED, .CATCHPOINT_UPDATED,
diff --git a/GUI/MyDocumentController.swift b/GUI/MyDocumentController.swift
index 1f8275304..05c0d43f4 100644
--- a/GUI/MyDocumentController.swift
+++ b/GUI/MyDocumentController.swift
@@ -23,7 +23,6 @@ class MyDocumentController: NSDocumentController {
             
             if let mydoc = doc as? MyDocument {
                 
-                // try? mydoc.addMedia(url: url, allowedTypes: FileType.all)
                 mydoc.launchUrl = url
                 return mydoc
             }
diff --git a/GUI/Peripherals/GamePad.swift b/GUI/Peripherals/GamePad.swift
index ab30bf88d..429a1842c 100644
--- a/GUI/Peripherals/GamePad.swift
+++ b/GUI/Peripherals/GamePad.swift
@@ -128,49 +128,6 @@ class GamePad {
         lScheme = db.left(vendorID: vendorID, productID: productID)
         rScheme = db.right(vendorID: vendorID, productID: productID)
         hScheme = db.hatSwitch(vendorID: vendorID, productID: productID)
-                        
-        /*
-        for i in 0...14 {
-            pressActions[i] = [.PRESS_FIRE]
-            releaseActions[i] = [.RELEASE_FIRE]
-        }
-
-        switch lScheme { // Left stick
-        case 1:
-            lxAxis = kHIDUsage_GD_Y
-            lyAxis = kHIDUsage_GD_X
-        default:
-            lxAxis = kHIDUsage_GD_X
-            lyAxis = kHIDUsage_GD_Y
-        }
-        
-        switch rScheme { // Right stick
-        case 1:
-            rxAxis = kHIDUsage_GD_Z
-            ryAxis = kHIDUsage_GD_Rz
-        default:
-            rxAxis = kHIDUsage_GD_Rz
-            ryAxis = kHIDUsage_GD_Z
-        }
-
-        switch hScheme { // Hat switch
-        case 1:
-            hShift = 1
-        case 2:
-            hShift = 0
-            pressActions[11] = [.PULL_UP]
-            releaseActions[11] = [.RELEASE_Y]
-            pressActions[12] = [.PULL_DOWN]
-            releaseActions[12] = [.RELEASE_Y]
-            pressActions[13] = [.PULL_LEFT]
-            releaseActions[13] = [.RELEASE_X]
-            pressActions[14] = [.PULL_RIGHT]
-            releaseActions[14] = [.RELEASE_X]
-
-        default:
-            hShift = 0
-        }
-        */
     }
         
     func setIcon(name: String) {
@@ -485,8 +442,7 @@ class GamePad {
                 }
 
             default:
-                // track("Unknown HID usage: \(usage)")")
-                break
+                debug(.hid, "Unknown HID usage: \(usage)")
             }
         }
         
diff --git a/GUI/Peripherals/GamePadManager.swift b/GUI/Peripherals/GamePadManager.swift
index ff00fa960..9223edb84 100644
--- a/GUI/Peripherals/GamePadManager.swift
+++ b/GUI/Peripherals/GamePadManager.swift
@@ -37,7 +37,7 @@ class GamePadManager {
     var lock = NSLock()
 
     //
-    // Initialization
+    // Initializing
     //
     
     init(parent: MyController) {
@@ -108,6 +108,8 @@ class GamePadManager {
     
     func shutDown() {
         
+        debug(.shutdown)
+        
         // Terminate communication with all connected HID devices
         for (_, pad) in gamePads { pad.device?.close() }
 
@@ -119,8 +121,8 @@ class GamePadManager {
     }
 
     deinit {
-
-        debug(.hid)
+        
+        debug(.shutdown)
     }
         
     //
@@ -140,7 +142,7 @@ class GamePadManager {
         // We support up to 5 devices
         if nr < 5 { return nr }
         
-        warn("Maximum number of devices reached.")
+        warn("Maximum number of devices reached")
         return nil
     }
     
@@ -172,12 +174,13 @@ class GamePadManager {
                         device: IOHIDDevice) {
     
         lock.lock(); defer { lock.unlock() }
+
+        debug(.hid)
+        // device.listProperties()
                 
         // Ignore internal devices
         if device.isInternalDevice { return }
         
-        device.listProperties()
-        
         // Find a free slot for the new device
         guard let slot = findFreeSlot() else { return }
         
diff --git a/GUI/Peripherals/HIDExtensions.swift b/GUI/Peripherals/HIDExtensions.swift
index 2dee4816a..356bc243a 100644
--- a/GUI/Peripherals/HIDExtensions.swift
+++ b/GUI/Peripherals/HIDExtensions.swift
@@ -7,8 +7,6 @@
 // See https://www.gnu.org for license information
 // -----------------------------------------------------------------------------
 
-import Foundation
-
 extension IOHIDDevice {
         
     @discardableResult
diff --git a/GUI/Peripherals/KeyboardController.swift b/GUI/Peripherals/KeyboardController.swift
index 1a8d154e7..5b8f0d52a 100644
--- a/GUI/Peripherals/KeyboardController.swift
+++ b/GUI/Peripherals/KeyboardController.swift
@@ -9,7 +9,6 @@
 
 import Carbon.HIToolbox
 
-// Keyboard event handler
 class KeyboardController: NSObject {
 
     // var myAppDelegate: MyAppDelegate { return NSApp.delegate as! MyAppDelegate }
diff --git a/GUI/System/Errors.swift b/GUI/System/Errors.swift
index 66bc37cfa..49bc5987a 100644
--- a/GUI/System/Errors.swift
+++ b/GUI/System/Errors.swift
@@ -202,14 +202,14 @@ enum Failure {
             "Visit FFmpeg.org for installation instructions."
             
         case .noMetalSupport: return
-            "vAmiga can only run on machines supporting the Metal graphics " +
+            "The emulator can only run on machines supporting the Metal graphics " +
             "technology (2012 models and above)."
             
         case .recorderAborted: return
             "Failed to write to the FFmpeg pipes."
         
         case let .recorderSandboxed(exec): return
-            "vAmiga is running as a sandboxed application and has no " +
+            "The emulator is running as a sandboxed application and has no " +
             "permission to access file \"\(exec)\"" +
             "Please copy the file to the Applications folder."
             
diff --git a/GUI/System/MacAudio.swift b/GUI/System/MacAudio.swift
index 987191ba0..94bb3d053 100644
--- a/GUI/System/MacAudio.swift
+++ b/GUI/System/MacAudio.swift
@@ -79,7 +79,7 @@ public class MacAudio: NSObject {
 
         // Register render callback
         if stereo {
-            audiounit.outputProvider = { ( // AURenderPullInputBlock
+            audiounit.outputProvider = { (
                 actionFlags,
                 timestamp,
                 frameCount,
@@ -90,7 +90,7 @@ public class MacAudio: NSObject {
                 return 0
             }
         } else {
-            audiounit.outputProvider = { ( // AURenderPullInputBlock
+            audiounit.outputProvider = { (
                 actionFlags,
                 timestamp,
                 frameCount,
diff --git a/Proxy/AmigaProxy.h b/Proxy/AmigaProxy.h
index 5e2c2197b..7a644adff 100644
--- a/Proxy/AmigaProxy.h
+++ b/Proxy/AmigaProxy.h
@@ -12,7 +12,7 @@
 #import "Constants.h"
 #import "config.h"
 #import "AgnusTypes.h"
-#import "AmigaComponentTypes.h"
+#import "CoreComponentTypes.h"
 #import "AmigaTypes.h"
 #import "AmigaFileTypes.h"
 #import "BlitterTypes.h"
@@ -122,7 +122,7 @@
 
 @end
 
-@interface AmigaComponentProxy : Proxy { }
+@interface CoreComponentProxy : Proxy { }
 
 @end
 
@@ -131,7 +131,7 @@
 // Host
 //
 
-@interface HostProxy : AmigaComponentProxy {
+@interface HostProxy : CoreComponentProxy {
 }
 
 @property double sampleRate;
@@ -145,7 +145,7 @@
 // Amiga
 //
 
-@interface AmigaProxy : AmigaComponentProxy {
+@interface AmigaProxy : CoreComponentProxy {
         
     AgnusProxy *agnus;
     CIAProxy *ciaA;
@@ -219,7 +219,6 @@
 @property (readonly) AmigaInfo info;
 @property BOOL warpMode;
 @property BOOL debugMode;
-@property (readonly) NSInteger masterFrequency;
 @property (readonly) NSInteger cpuLoad;
 @property InspectionTarget inspectionTarget;
 - (void) removeInspectionTarget;
@@ -333,7 +332,7 @@
 // CPU
 //
 
-@interface CPUProxy : AmigaComponentProxy { }
+@interface CPUProxy : CoreComponentProxy { }
     
 @property (readonly) CPUInfo info;
 @property (readonly) i64 clock;
@@ -347,9 +346,10 @@
 - (NSString *)disassembleRecordedFlags:(NSInteger)i;
 - (NSString *)disassembleRecordedPC:(NSInteger)i;
 
+- (NSString *)disassembleWord:(NSInteger)value;
+- (NSString *)disassembleAddr:(NSInteger)addr;
 - (NSString *)disassembleInstr:(NSInteger)addr length:(NSInteger *)len;
 - (NSString *)disassembleWords:(NSInteger)addr length:(NSInteger)len;
-- (NSString *)disassembleAddr:(NSInteger)addr;
 
 - (NSString *)vectorName:(NSInteger)nr;
 
@@ -360,7 +360,7 @@
 // CIA
 //
 
-@interface CIAProxy : AmigaComponentProxy { }
+@interface CIAProxy : CoreComponentProxy { }
  
 @property (readonly) CIAInfo info;
 
@@ -371,7 +371,7 @@
 // Memory
 //
 
-@interface MemProxy : AmigaComponentProxy { }
+@interface MemProxy : CoreComponentProxy { }
 
 @property (readonly) MemoryConfig config;
 
@@ -434,7 +434,7 @@
 // Agnus
 //
 
-@interface AgnusProxy : AmigaComponentProxy { }
+@interface AgnusProxy : CoreComponentProxy { }
 
 @property (readonly) NSInteger chipRamLimit;
 @property (readonly) AgnusInfo info;
@@ -454,7 +454,7 @@
 // Copper
 //
 
-@interface CopperProxy : AmigaComponentProxy { }
+@interface CopperProxy : CoreComponentProxy { }
 
 @property (readonly) CopperInfo info;
 
@@ -469,7 +469,7 @@
 // Blitter
 //
 
-@interface BlitterProxy : AmigaComponentProxy { }
+@interface BlitterProxy : CoreComponentProxy { }
 
 @property (readonly) BlitterInfo info;
 
@@ -490,7 +490,7 @@
 // Denise
 //
 
-@interface DeniseProxy : AmigaComponentProxy { }
+@interface DeniseProxy : CoreComponentProxy { }
 
 @property (readonly) DeniseInfo info;
 - (SpriteInfo)getSpriteInfo:(NSInteger)nr;
@@ -499,12 +499,8 @@
 - (u64)sprData:(NSInteger)nr line:(NSInteger)line;
 - (u16)sprColor:(NSInteger)nr reg:(NSInteger)reg;
 
-@property (readonly) NSInteger frameNr;
-@property (readonly) BOOL longFrame;
-@property (readonly) u32 *stableBuffer;
 @property (readonly) u32 *noise;
-
-- (void)getStableBuffer:(u32 **)ptr nr:(i64 *)nr;
+- (void)getStableBuffer:(u32 **)ptr nr:(NSInteger *)nr lof:(bool *)lof prevlof:(bool *)prevlof;
 
 @end
 
@@ -539,7 +535,7 @@
 // Paula
 //
 
-@interface PaulaProxy : AmigaComponentProxy { }
+@interface PaulaProxy : CoreComponentProxy { }
 
 @property (readonly) PaulaInfo info;
 @property (readonly) StateMachineInfo audioInfo0;
@@ -573,7 +569,7 @@
 // RTC
 //
 
-@interface RtcProxy : AmigaComponentProxy { }
+@interface RtcProxy : CoreComponentProxy { }
 
 - (void)update;
 
@@ -584,7 +580,7 @@
 // ControlPort
 //
 
-@interface ControlPortProxy : AmigaComponentProxy {
+@interface ControlPortProxy : CoreComponentProxy {
         
     MouseProxy *mouse;
     JoystickProxy *joystick;
@@ -602,7 +598,7 @@
 // SerialPort
 //
 
-@interface SerialPortProxy : AmigaComponentProxy { }
+@interface SerialPortProxy : CoreComponentProxy { }
 
 @property (readonly) SerialPortInfo info;
 
@@ -613,7 +609,7 @@
 // Mouse
 //
 
-@interface MouseProxy : AmigaComponentProxy { }
+@interface MouseProxy : CoreComponentProxy { }
 
 - (BOOL)detectShakeAbs:(NSPoint)pos;
 - (BOOL)detectShakeRel:(NSPoint)pos;
@@ -628,7 +624,7 @@
 // Joystick
 //
 
-@interface JoystickProxy : AmigaComponentProxy { }
+@interface JoystickProxy : CoreComponentProxy { }
 
 - (void)trigger:(GamePadAction)event;
 
@@ -639,7 +635,7 @@
 // Keyboard
 //
 
-@interface KeyboardProxy : AmigaComponentProxy { }
+@interface KeyboardProxy : CoreComponentProxy { }
 
 - (BOOL)keyIsPressed:(NSInteger)keycode;
 - (void)pressKey:(NSInteger)keycode;
@@ -654,7 +650,7 @@
 // DiskController
 //
 
-@interface DiskControllerProxy : AmigaComponentProxy { }
+@interface DiskControllerProxy : CoreComponentProxy { }
 
 - (DiskControllerConfig)getConfig;
 @property (readonly) DiskControllerInfo info;
@@ -669,7 +665,7 @@
 // DriveProxy
 //
 
-@interface DriveProxy : AmigaComponentProxy { }
+@interface DriveProxy : CoreComponentProxy { }
 
 @property (readonly) NSInteger nr;
 @property (readonly) BOOL isConnected;
@@ -806,6 +802,7 @@
 - (void)pressEnd;
 - (void)pressBackspace;
 - (void)pressDelete;
+- (void)pressCut;
 - (void)pressReturn;
 - (void)pressShiftReturn;
 - (void)pressTab;
diff --git a/Proxy/AmigaProxy.mm b/Proxy/AmigaProxy.mm
index 72a0cbc76..25e0aff78 100644
--- a/Proxy/AmigaProxy.mm
+++ b/Proxy/AmigaProxy.mm
@@ -68,14 +68,14 @@ - (instancetype)initWith:(void *)ref
 @end
 
 //
-// AmigaComponent proxy
+// CoreComponent proxy
 //
 
-@implementation AmigaComponentProxy
+@implementation CoreComponentProxy
 
--(AmigaComponent *)component
+-(CoreComponent *)component
 {
-    return (AmigaComponent *)obj;
+    return (CoreComponent *)obj;
 }
 
 @end
@@ -328,6 +328,18 @@ - (NSString *)disassembleRecordedPC:(NSInteger)i
     return str ? @(str) : nullptr;
 }
 
+- (NSString *)disassembleWord:(NSInteger)value
+{
+    const char *str = [self cpu]->disassembleWord((u16)value);
+    return str ? @(str) : nullptr;
+}
+
+- (NSString *)disassembleAddr:(NSInteger)addr
+{
+    const char *str = [self cpu]->disassembleAddr((u32)addr);
+    return str ? @(str) : nullptr;
+}
+
 - (NSString *)disassembleInstr:(NSInteger)addr length:(NSInteger *)len
 {
     isize result;
@@ -343,12 +355,6 @@ - (NSString *)disassembleWords:(NSInteger)addr length:(NSInteger)len
     return str ? @(str) : nullptr;
 }
 
-- (NSString *)disassembleAddr:(NSInteger)addr
-{
-    const char *str = [self cpu]->disassembleAddr((u32)addr);
-    return str ? @(str) : nullptr;
-}
-
 - (NSString *)vectorName:(NSInteger)nr
 {
     auto name = [self cpu]->debugger.vectorName(u8(nr));
@@ -849,31 +855,18 @@ - (u16)sprColor:(NSInteger)nr reg:(NSInteger)reg
     return [self denise]->debugger.getSpriteColor(nr, reg);
 }
 
-- (NSInteger)frameNr
-{
-    return [self denise]->pixelEngine.getStableBuffer().nr;
-}
-
-- (BOOL)longFrame
-{
-    return [self denise]->pixelEngine.getStableBuffer().longFrame;
-}
-
-- (u32 *)stableBuffer
-{
-    return (u32 *)([self denise]->pixelEngine.stablePtr());
-}
-
 - (u32 *)noise
 {
     return (u32 *)([self denise]->pixelEngine.getNoise());
 }
 
-- (void)getStableBuffer:(u32 **)ptr nr:(i64 *)nr
+- (void)getStableBuffer:(u32 **)ptr nr:(NSInteger *)nr lof:(bool *)lof prevlof:(bool *)prevlof
 {
     auto &frameBuffer = [self denise]->pixelEngine.getStableBuffer();
     *ptr = frameBuffer.pixels.ptr;
-    *nr = frameBuffer.nr;
+    *nr = NSInteger(frameBuffer.nr);
+    *lof = frameBuffer.lof;
+    *prevlof = frameBuffer.prevlof;
 }
 
 
@@ -1360,13 +1353,6 @@ - (NSInteger)currentOffset
     return [self drive]->currentOffset();
 }
 
-/*
-- (u64)fnv
-{
-    return [self drive]->fnv();
-}
-*/
-
 - (BOOL)hasDisk
 {
     return [self drive]->hasDisk();
@@ -1945,6 +1931,11 @@ - (void)pressDelete
     [self shell]->press(RSKEY_DEL);
 }
 
+- (void)pressCut
+{
+    [self shell]->press(RSKEY_CUT);
+}
+
 - (void)pressReturn
 {
     [self shell]->press(RSKEY_RETURN);
@@ -2042,7 +2033,7 @@ - (NSString *)sizeAsString
 
 - (u64)fnv
 {
-    return [self file]->fnv();
+    return [self file]->fnv64();
 }
 
 - (void)setPath:(NSString *)path
@@ -2741,10 +2732,14 @@ - (instancetype) init
 {
     if (!(self = [super init]))
         return self;
-    
+
+    // Create the emulator instance
     Amiga *amiga = new Amiga();
     obj = amiga;
-    
+
+    // Launch the emulator thread
+    amiga->launch();
+
     // Create sub proxys
     agnus = [[AgnusProxy alloc] initWith:&amiga->agnus];
     blitter = [[BlitterProxy alloc] initWith:&amiga->agnus.blitter];
@@ -2838,11 +2833,6 @@ - (void)setDebugMode:(BOOL)value
     }
 }
 
-- (NSInteger)masterFrequency
-{
-    return [self amiga]->masterClockFrequency();
-}
-
 - (NSInteger)cpuLoad
 {
     double load = [self amiga]->getCpuLoad();
diff --git a/Resources/Info.plist b/Resources/Info.plist
index 4ed49a55c..01a1e93a8 100644
--- a/Resources/Info.plist
+++ b/Resources/Info.plist
@@ -156,7 +156,7 @@
 	<key>NSAppleEventsUsageDescription</key>
 	<string></string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2022 Dirk Hoffmann. All rights reserved.</string>
+	<string>Copyright © 2023 Dirk Hoffmann. All rights reserved.</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
diff --git a/XIB files/Configuration.xib b/XIB files/Configuration.xib
index f16deb338..afadd4da2 100644
--- a/XIB files/Configuration.xib	
+++ b/XIB files/Configuration.xib	
@@ -156,6 +156,9 @@
                 <outlet property="vidEnhancerPopUp" destination="vmV-7H-7fh" id="TvF-XT-xW0"/>
                 <outlet property="vidFlickerPopUp" destination="fro-ed-ano" id="IZj-wi-Zi5"/>
                 <outlet property="vidFlickerWeightSlider" destination="0Y9-Rh-mXL" id="8gm-Gx-bTX"/>
+                <outlet property="vidFpsMax" destination="GEA-mo-NHg" id="tgE-Gz-JsX"/>
+                <outlet property="vidFpsMin" destination="di0-Dy-L25" id="QxA-PR-PxZ"/>
+                <outlet property="vidFpsSlider" destination="50n-LK-F7k" id="Qbg-7i-wDf"/>
                 <outlet property="vidHCenter" destination="Bja-RZ-tTr" id="UsT-3X-hqJ"/>
                 <outlet property="vidHCenterLabel" destination="h8h-Mj-laT" id="rd5-HH-i2q"/>
                 <outlet property="vidHZoom" destination="oKa-UC-vHh" id="GXs-ie-Ynt"/>
@@ -170,12 +173,12 @@
                 <outlet property="vidScanlineBrightnessSlider" destination="AWg-ot-BhE" id="1qA-Id-w4m"/>
                 <outlet property="vidScanlineWeightSlider" destination="EYN-fQ-glL" id="REw-5A-5bs"/>
                 <outlet property="vidScanlinesPopUp" destination="s55-1G-JzC" id="iAh-DE-q3Q"/>
+                <outlet property="vidSyncMode" destination="XmN-Gl-r9d" id="1AQ-7r-6LU"/>
                 <outlet property="vidUpscalerPopUp" destination="WHl-5V-2c2" id="UXA-lC-U2g"/>
                 <outlet property="vidVCenter" destination="jms-qV-MhZ" id="kYm-Lx-wMS"/>
                 <outlet property="vidVCenterLabel" destination="zP8-79-N2H" id="kxP-zk-puP"/>
                 <outlet property="vidVZoom" destination="o9U-pP-jee" id="HNR-2w-F55"/>
                 <outlet property="vidVZoomLabel" destination="7aj-uQ-9Uv" id="TaG-XE-CPH"/>
-                <outlet property="vidVsync" destination="F2S-X0-SqJ" id="lff-Eq-tzA"/>
                 <outlet property="vidZoom" destination="Ry2-eS-ugp" id="kR6-Yb-aef"/>
                 <outlet property="window" destination="QvC-M9-y7g" id="grC-RL-8ju"/>
             </connections>
@@ -3302,6 +3305,15 @@ DQ
                                                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                                 </textFieldCell>
                                                             </textField>
+                                                            <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="di0-Dy-L25">
+                                                                <rect key="frame" x="308" y="31" width="22" height="11"/>
+                                                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+                                                                <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="MIN" id="Oze-p7-PRM">
+                                                                    <font key="font" metaFont="miniSystem"/>
+                                                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                                    <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                                                </textFieldCell>
+                                                            </textField>
                                                             <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="zP8-79-N2H">
                                                                 <rect key="frame" x="392" y="93" width="50" height="11"/>
                                                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
@@ -3341,6 +3353,30 @@ DQ
                                                                     <action selector="vidCenterAction:" target="-2" id="YUV-U0-2IB"/>
                                                                 </connections>
                                                             </popUpButton>
+                                                            <popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="XmN-Gl-r9d">
+                                                                <rect key="frame" x="138" y="21" width="156" height="26"/>
+                                                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+                                                                <popUpButtonCell key="cell" type="push" title="Native" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" refusesFirstResponder="YES" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" autoenablesItems="NO" selectedItem="cw8-oC-EMA" id="D6H-2Y-ahD">
+                                                                    <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+                                                                    <font key="font" metaFont="menu"/>
+                                                                    <menu key="menu" title="OtherViews" autoenablesItems="NO" id="UmV-Eh-RCa">
+                                                                        <items>
+                                                                            <menuItem title="Native" state="on" id="cw8-oC-EMA">
+                                                                                <modifierMask key="keyEquivalentModifierMask"/>
+                                                                            </menuItem>
+                                                                            <menuItem title="Custom" tag="1" id="XIB-dC-hld">
+                                                                                <modifierMask key="keyEquivalentModifierMask"/>
+                                                                            </menuItem>
+                                                                            <menuItem title="VSYNC" tag="2" id="xvk-2T-jC6">
+                                                                                <modifierMask key="keyEquivalentModifierMask"/>
+                                                                            </menuItem>
+                                                                        </items>
+                                                                    </menu>
+                                                                </popUpButtonCell>
+                                                                <connections>
+                                                                    <action selector="vidSyncModeAction:" target="-2" id="P9T-s8-FSN"/>
+                                                                </connections>
+                                                            </popUpButton>
                                                             <slider horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="jms-qV-MhZ">
                                                                 <rect key="frame" x="403" y="106" width="28" height="30"/>
                                                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
@@ -3365,22 +3401,28 @@ DQ
                                                                 <rect key="frame" x="9" y="72" width="557" height="5"/>
                                                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                             </box>
-                                                            <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="F2S-X0-SqJ">
-                                                                <rect key="frame" x="139" y="26" width="70" height="18"/>
-                                                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                                                <buttonCell key="cell" type="check" title="VSYNC" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="c7c-DF-qFS">
-                                                                    <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                                            <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="EMY-1X-abl">
+                                                                <rect key="frame" x="44" y="26" width="90" height="18"/>
+                                                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+                                                                <textFieldCell key="cell" refusesFirstResponder="YES" sendsActionOnEndEditing="YES" alignment="right" title="Frame Rate: " id="eCK-Jf-jcI">
                                                                     <font key="font" metaFont="system"/>
-                                                                </buttonCell>
+                                                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                                    <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                                                </textFieldCell>
+                                                            </textField>
+                                                            <slider verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="50n-LK-F7k">
+                                                                <rect key="frame" x="336" y="20" width="145" height="28"/>
+                                                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                                                <sliderCell key="cell" continuous="YES" state="on" alignment="left" minValue="25" maxValue="120" doubleValue="50" tickMarkPosition="above" numberOfTickMarks="10" sliderType="linear" id="pqE-F0-G0y"/>
                                                                 <connections>
-                                                                    <action selector="vidVsyncAction:" target="-2" id="Jyo-Ul-PtG"/>
+                                                                    <action selector="vidFpsAction:" target="-2" id="pKu-2u-SA8"/>
                                                                 </connections>
-                                                            </button>
-                                                            <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="EMY-1X-abl">
-                                                                <rect key="frame" x="64" y="26" width="70" height="18"/>
+                                                            </slider>
+                                                            <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="GEA-mo-NHg">
+                                                                <rect key="frame" x="488" y="31" width="25" height="11"/>
                                                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
-                                                                <textFieldCell key="cell" refusesFirstResponder="YES" sendsActionOnEndEditing="YES" alignment="right" title="Refresh: " id="eCK-Jf-jcI">
-                                                                    <font key="font" metaFont="system"/>
+                                                                <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="MAX" id="rYH-u6-gbi">
+                                                                    <font key="font" metaFont="miniSystem"/>
                                                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                                 </textFieldCell>
diff --git a/XIB files/Inspector.xib b/XIB files/Inspector.xib
index eefcc0031..3870cc2b8 100644
--- a/XIB files/Inspector.xib	
+++ b/XIB files/Inspector.xib	
@@ -8345,19 +8345,8 @@
                             <outlet property="delegate" destination="-2" id="T01-0F-Umv"/>
                         </connections>
                     </tabView>
-                    <button toolTip="Step Into" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="i48-Od-rYl">
-                        <rect key="frame" x="49" y="8" width="34" height="34"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
-                        <buttonCell key="cell" type="squareTextured" bezelStyle="texturedSquare" image="stepIntoTemplate" imagePosition="only" alignment="center" borderStyle="border" imageScaling="proportionallyUpOrDown" inset="2" id="aC4-Zj-CQR">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="system"/>
-                        </buttonCell>
-                        <connections>
-                            <action selector="stepIntoAction:" target="-2" id="E3M-kV-Tpu"/>
-                        </connections>
-                    </button>
                     <button toolTip="Step Over" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="RyZ-E9-b7L">
-                        <rect key="frame" x="81" y="8" width="34" height="34"/>
+                        <rect key="frame" x="51" y="8" width="34" height="34"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                         <buttonCell key="cell" type="squareTextured" bezelStyle="texturedSquare" image="stepOverTemplate" imagePosition="only" alignment="center" borderStyle="border" imageScaling="proportionallyUpOrDown" inset="2" id="IKI-GE-3tJ">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -8379,7 +8368,7 @@
                         </connections>
                     </button>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="h5D-Xp-p6b">
-                        <rect key="frame" x="119" y="18" width="731" height="16"/>
+                        <rect key="frame" x="121" y="18" width="731" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <textFieldCell key="cell" lineBreakMode="clipping" title="Ipsum lorem" id="JQf-46-kcK">
                             <font key="font" usesAppearanceFont="YES"/>
@@ -8387,6 +8376,17 @@
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
+                    <button toolTip="Step Into" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="i48-Od-rYl">
+                        <rect key="frame" x="85" y="8" width="34" height="34"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+                        <buttonCell key="cell" type="squareTextured" bezelStyle="texturedSquare" image="stepIntoTemplate" imagePosition="only" alignment="center" borderStyle="border" imageScaling="proportionallyUpOrDown" inset="2" id="aC4-Zj-CQR">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="stepIntoAction:" target="-2" id="E3M-kV-Tpu"/>
+                        </connections>
+                    </button>
                 </subviews>
             </view>
             <connections>
diff --git a/XIB files/en.lproj/MainMenu.xib b/XIB files/en.lproj/MainMenu.xib
index 624c19523..ac75ec8a4 100644
--- a/XIB files/en.lproj/MainMenu.xib	
+++ b/XIB files/en.lproj/MainMenu.xib	
@@ -35,7 +35,6 @@
                                     <action selector="orderFrontStandardAboutPanel:" target="-2" id="142"/>
                                 </connections>
                             </menuItem>
-                            <menuItem title="Check for Updates..." hidden="YES" keyEquivalent="u" id="412"/>
                             <menuItem isSeparatorItem="YES" id="202">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
@@ -123,25 +122,11 @@
                                 </connections>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="aWt-rp-gig"/>
-                            <menuItem title="Hardware" id="J9m-QD-9VI">
+                            <menuItem title="Configure..." keyEquivalent="" id="Y6J-U9-htE" userLabel="Configure...">
                                 <modifierMask key="keyEquivalentModifierMask"/>
-                                <menu key="submenu" title="Hardware" id="k7j-8d-ksq">
-                                    <items>
-                                        <menuItem title="Configure..." keyEquivalent="" id="Y6J-U9-htE" userLabel="Configure...">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="configureAction:" target="-1" id="63m-54-OYh"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem isSeparatorItem="YES" id="Dr6-F8-vOV"/>
-                                        <menuItem title="Restore Factory Settings" id="TX7-U7-EG7">
-                                            <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="factorySettingsAction:" target="-1" id="eUA-v2-Mow"/>
-                                            </connections>
-                                        </menuItem>
-                                    </items>
-                                </menu>
+                                <connections>
+                                    <action selector="configureAction:" target="-1" id="63m-54-OYh"/>
+                                </connections>
                             </menuItem>
                             <menuItem title="Inspector..." keyEquivalent="" id="jIT-6f-DxM" userLabel="Inspector...">
                                 <modifierMask key="keyEquivalentModifierMask" shift="YES"/>
@@ -155,21 +140,32 @@
                                     <action selector="monitorAction:" target="-1" id="hps-FK-7Yl"/>
                                 </connections>
                             </menuItem>
-                            <menuItem title="Console..." keyEquivalent="^" id="x3U-7k-jeR" userLabel="Monitor...">
+                            <menuItem title="Console..." keyEquivalent="^" id="x3U-7k-jeR">
                                 <connections>
                                     <action selector="consoleAction:" target="-1" id="Nx9-Xz-OIt"/>
                                 </connections>
                             </menuItem>
+                            <menuItem title="Restore Factory Settings" id="TX7-U7-EG7">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="factorySettingsAction:" target="-1" id="eUA-v2-Mow"/>
+                                </connections>
+                            </menuItem>
                             <menuItem isSeparatorItem="YES" id="bDU-dO-xxe"/>
-                            <menuItem title="Take Snapshot" keyEquivalent="t" id="BX4-y5-PoI" userLabel="Take Snapshot">
+                            <menuItem title="Take Snapshot" keyEquivalent="+" id="BX4-y5-PoI" userLabel="Take Snapshot">
                                 <connections>
                                     <action selector="takeSnapshotAction:" target="-1" id="eOH-IU-76n"/>
                                 </connections>
                             </menuItem>
-                            <menuItem title="Browse Snapshots..." id="NXb-gr-Vem" userLabel="Browse Snapshots...">
+                            <menuItem title="Restore Latest Snapshot" keyEquivalent="-" id="NXb-gr-Vem" userLabel="Browse Snapshots...">
+                                <connections>
+                                    <action selector="restoreSnapshotAction:" target="-1" id="FOP-1l-x9L"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Browse Snapshots..." id="1Qj-mi-C7u" userLabel="Browse Snapshots...">
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <connections>
-                                    <action selector="browseSnapshotsAction:" target="-1" id="3RJ-Yf-Aab"/>
+                                    <action selector="browseSnapshotsAction:" target="-1" id="GRh-zJ-bZz"/>
                                 </connections>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="5uV-Cr-Apb"/>
@@ -226,12 +222,14 @@
                                 </connections>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="qq8-Qm-VmD"/>
-                            <menuItem title="Pause" keyEquivalent="p" id="430">
+                            <menuItem title="Pause" keyEquivalent="y" id="430">
+                                <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
                                 <connections>
                                     <action selector="stopAndGoAction:" target="-1" id="MO3-RA-MNi"/>
                                 </connections>
                             </menuItem>
                             <menuItem title="Reset" keyEquivalent="r" id="432">
+                                <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
                                 <connections>
                                     <action selector="resetAction:" target="-1" id="SV8-EZ-6HI"/>
                                 </connections>
@@ -243,18 +241,24 @@
                                 </connections>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="2Hk-Nm-Uix"/>
-                            <menuItem title="Step Into" keyEquivalent="I" id="429">
+                            <menuItem title="Step Over" keyEquivalent="" id="428">
+                                <modifierMask key="keyEquivalentModifierMask"/>
                                 <connections>
-                                    <action selector="stepIntoAction:" target="-1" id="i9e-j1-AG9"/>
+                                    <action selector="stepOverAction:" target="-1" id="WJR-b6-K0I"/>
                                 </connections>
                             </menuItem>
-                            <menuItem title="Step Over" keyEquivalent="O" id="428">
+                            <menuItem title="Step Into" keyEquivalent="" id="429">
+                                <modifierMask key="keyEquivalentModifierMask"/>
                                 <connections>
-                                    <action selector="stepOverAction:" target="-1" id="WJR-b6-K0I"/>
+                                    <action selector="stepIntoAction:" target="-1" id="i9e-j1-AG9"/>
                                 </connections>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="Nni-8k-nVh"/>
-                            <menuItem title="Toggle Warp Mode" keyEquivalent="W" id="UwY-4X-reL">
+                            <menuItem title="Toggle Warp Mode" id="UwY-4X-reL">
+                                <string key="keyEquivalent" base64-UTF8="YES">
+CQ
+</string>
+                                <modifierMask key="keyEquivalentModifierMask" control="YES"/>
                                 <connections>
                                     <action selector="warpAction:" target="-1" id="Oh0-IU-v3E"/>
                                 </connections>
@@ -279,6 +283,7 @@
                                 </connections>
                             </menuItem>
                             <menuItem title="Show Status Bar" keyEquivalent="b" id="nZ5-yO-Ch3">
+                                <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
                                 <connections>
                                     <action selector="toggleStatusBarAction:" target="-1" id="XV7-PD-saG"/>
                                 </connections>
@@ -314,7 +319,6 @@
                                     <action selector="mapRightCmdKeyAction:" target="-1" id="Z3K-od-06m"/>
                                 </connections>
                             </menuItem>
-                            <menuItem isSeparatorItem="YES" id="i1a-9I-H6M"/>
                             <menuItem title="Control Warp Mode with Caps Lock Key" id="QzJ-1p-Opa">
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <connections>
@@ -1583,7 +1587,7 @@
                 <menuItem title="Help" id="103">
                     <menu key="submenu" title="Help" id="106">
                         <items>
-                            <menuItem title="Virtual C64 Help" hidden="YES" enabled="NO" keyEquivalent="?" id="111">
+                            <menuItem title="vAmiga Help" hidden="YES" enabled="NO" keyEquivalent="?" id="111">
                                 <connections>
                                     <action selector="showHelp:" target="-1" id="122"/>
                                 </connections>
@@ -1594,21 +1598,5 @@
             </items>
             <point key="canvasLocation" x="139" y="154"/>
         </menu>
-        <menuItem title="Narrow style" id="hwU-hm-b10">
-            <modifierMask key="keyEquivalentModifierMask"/>
-        </menuItem>
-        <menuItem isSeparatorItem="YES" id="GUM-Ys-uP8"/>
-        <menuItem title="Inspect..." id="R2o-he-i46">
-            <modifierMask key="keyEquivalentModifierMask"/>
-            <connections>
-                <action selector="inspectDiskAction:" target="-1" id="Kb0-1S-5CK"/>
-            </connections>
-        </menuItem>
-        <menuItem title="Inspect Disk..." tag="2" id="RMP-E9-ph4">
-            <modifierMask key="keyEquivalentModifierMask"/>
-            <connections>
-                <action selector="inspectDiskAction:" target="-1" id="Cwr-H3-1cp"/>
-            </connections>
-        </menuItem>
     </objects>
 </document>
diff --git a/XIB files/en.lproj/MyDocument.xib b/XIB files/en.lproj/MyDocument.xib
index 35629c03c..335436dab 100644
--- a/XIB files/en.lproj/MyDocument.xib	
+++ b/XIB files/en.lproj/MyDocument.xib	
@@ -347,7 +347,7 @@
                         <popUpButton key="view" tag="11" id="4MP-rV-xX2" userLabel="Port 2">
                             <rect key="frame" x="0.0" y="14" width="45" height="24"/>
                             <autoresizingMask key="autoresizingMask"/>
-                            <popUpButtonCell key="cell" type="roundTextured" title="None" bezelStyle="texturedRounded" image="devNoneTemplate" imagePosition="only" alignment="center" lineBreakMode="truncatingTail" state="on" tag="-1" imageScaling="proportionallyDown" inset="2" autoenablesItems="NO" selectedItem="xyt-eC-0im" id="skK-6M-sib" userLabel="PopupButtonCell">
+                            <popUpButtonCell key="cell" type="roundTextured" title="None" bezelStyle="texturedRounded" imagePosition="only" alignment="center" lineBreakMode="truncatingTail" state="on" tag="-1" imageScaling="proportionallyDown" inset="2" autoenablesItems="NO" selectedItem="xyt-eC-0im" id="skK-6M-sib" userLabel="PopupButtonCell">
                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                 <font key="font" metaFont="menu"/>
                                 <menu key="menu" autoenablesItems="NO" id="L3K-on-eyR">
diff --git a/vAmiga.xcodeproj/project.pbxproj b/vAmiga.xcodeproj/project.pbxproj
index 310cecfc4..b60947ecd 100644
--- a/vAmiga.xcodeproj/project.pbxproj
+++ b/vAmiga.xcodeproj/project.pbxproj
@@ -98,8 +98,6 @@
 		50627FD5286EBACA00F2A835 /* FrameBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50627FD1286EBA7300F2A835 /* FrameBuffer.cpp */; };
 		5062DB1224370FE400ACEEE2 /* MyControllerSnapshots.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5062DB1124370FE400ACEEE2 /* MyControllerSnapshots.swift */; };
 		5064851121EC7A1700FC4AC3 /* Memory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5064850F21EC7A1700FC4AC3 /* Memory.cpp */; };
-		50672CBD29460FF9004113F5 /* RetroShellDebugCmds.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50672CBC29460FF9004113F5 /* RetroShellDebugCmds.cpp */; };
-		50672CBE29460FF9004113F5 /* RetroShellDebugCmds.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50672CBC29460FF9004113F5 /* RetroShellDebugCmds.cpp */; };
 		50672CC02946100F004113F5 /* InterpreterDebugCmds.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50672CBF2946100F004113F5 /* InterpreterDebugCmds.cpp */; };
 		50672CC12946100F004113F5 /* InterpreterDebugCmds.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50672CBF2946100F004113F5 /* InterpreterDebugCmds.cpp */; };
 		506ACE44279AC75100BA7877 /* SequencerDas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 506ACE43279AC75100BA7877 /* SequencerDas.cpp */; };
@@ -178,7 +176,6 @@
 		509C365A260B1766004F160A /* Command.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 509C3658260B1766004F160A /* Command.cpp */; };
 		509C365E260B177E004F160A /* Interpreter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 509C365C260B177E004F160A /* Interpreter.cpp */; };
 		509C3663260B1D95004F160A /* InterpreterCmds.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 509C3662260B1D95004F160A /* InterpreterCmds.cpp */; };
-		509C3668260B3ED0004F160A /* RetroShellCmds.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 509C3667260B3ED0004F160A /* RetroShellCmds.cpp */; };
 		509C66792551577D0028D497 /* Folder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 509C66772551577D0028D497 /* Folder.cpp */; };
 		509CF4CD22083F9800C500F0 /* CPUPanel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 509CF4CC22083F9800C500F0 /* CPUPanel.swift */; };
 		509CF4CF220847C600C500F0 /* InstrTableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 509CF4CE220847C600C500F0 /* InstrTableView.swift */; };
@@ -212,8 +209,8 @@
 		50AFEBBA278EF5FD00F422D5 /* Sequencer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50AFEBB8278EF5FD00F422D5 /* Sequencer.cpp */; };
 		50AFEBBE278EF6CB00F422D5 /* SequencerInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50AFEBBD278EF6CB00F422D5 /* SequencerInfo.cpp */; };
 		50B0AF93222531C500EE3689 /* CopperTableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50B0AF92222531C500EE3689 /* CopperTableView.swift */; };
-		50B14C0721EB218E002E32A6 /* AmigaObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50B14C0521EB218E002E32A6 /* AmigaObject.cpp */; };
-		50B14C0D21EB3708002E32A6 /* AmigaComponent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50B14C0B21EB3708002E32A6 /* AmigaComponent.cpp */; };
+		50B14C0721EB218E002E32A6 /* CoreObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50B14C0521EB218E002E32A6 /* CoreObject.cpp */; };
+		50B14C0D21EB3708002E32A6 /* CoreComponent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50B14C0B21EB3708002E32A6 /* CoreComponent.cpp */; };
 		50B14C1021EB410B002E32A6 /* Amiga.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50B14C0E21EB410B002E32A6 /* Amiga.cpp */; };
 		50B14C1F21EB8445002E32A6 /* drive_click.aiff in Resources */ = {isa = PBXBuildFile; fileRef = 50B14C1721EB8445002E32A6 /* drive_click.aiff */; };
 		50B14C2021EB8445002E32A6 /* drive_head.aiff in Resources */ = {isa = PBXBuildFile; fileRef = 50B14C1821EB8445002E32A6 /* drive_head.aiff */; };
@@ -307,10 +304,10 @@
 		50FC047D27DA12AB00C3E566 /* StringUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 506D6AB0276C7B2D002C9711 /* StringUtils.cpp */; };
 		50FC047E27DA12AB00C3E566 /* IOUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50C0B78025EC367000CDE1F2 /* IOUtils.cpp */; };
 		50FC047F27DA12AB00C3E566 /* Parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50A61461260DB7F900A01428 /* Parser.cpp */; };
-		50FC048027DA190400C3E566 /* AmigaComponent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50B14C0B21EB3708002E32A6 /* AmigaComponent.cpp */; };
+		50FC048027DA190400C3E566 /* CoreComponent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50B14C0B21EB3708002E32A6 /* CoreComponent.cpp */; };
 		50FC048127DA190400C3E566 /* SubComponent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50E79BE7232D123000D296FB /* SubComponent.cpp */; };
 		50FC048227DA190400C3E566 /* MsgQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 508FDEF521EA1FBC0043D0E9 /* MsgQueue.cpp */; };
-		50FC048327DA190400C3E566 /* AmigaObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50B14C0521EB218E002E32A6 /* AmigaObject.cpp */; };
+		50FC048327DA190400C3E566 /* CoreObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50B14C0521EB218E002E32A6 /* CoreObject.cpp */; };
 		50FC048427DA190400C3E566 /* Thread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5042F2DB26BE57E600126C05 /* Thread.cpp */; };
 		50FC048527DA190400C3E566 /* Error.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50AE6F8425D71FBE0004AFBC /* Error.cpp */; };
 		50FC048627DA194200C3E566 /* MoiraDebugger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50E2BE29240D418500155AE4 /* MoiraDebugger.cpp */; };
@@ -393,7 +390,6 @@
 		50FC04D427DA19F600C3E566 /* FSBlock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50565070254573E100A79D27 /* FSBlock.cpp */; };
 		50FC04D527DA1A0000C3E566 /* InterpreterCmds.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 509C3662260B1D95004F160A /* InterpreterCmds.cpp */; };
 		50FC04D627DA1A0000C3E566 /* Command.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 509C3658260B1766004F160A /* Command.cpp */; };
-		50FC04D727DA1A0000C3E566 /* RetroShellCmds.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 509C3667260B3ED0004F160A /* RetroShellCmds.cpp */; };
 		50FC04D827DA1A0000C3E566 /* RetroShell.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50B9C426260942D000A86C31 /* RetroShell.cpp */; };
 		50FC04D927DA1A0000C3E566 /* TextStorage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50AD904C276E10660011ECCB /* TextStorage.cpp */; };
 		50FC04DA27DA1A0000C3E566 /* Interpreter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 509C365C260B177E004F160A /* Interpreter.cpp */; };
@@ -498,6 +494,7 @@
 		501A9936243A07A100D269B2 /* Storage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Storage.swift; sourceTree = "<group>"; };
 		501B821B2262FFB200042871 /* RTC.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RTC.cpp; sourceTree = "<group>"; };
 		501B821C2262FFB200042871 /* RTC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RTC.h; sourceTree = "<group>"; };
+		501C46BA296413C100C4B27B /* SelfTestScript.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SelfTestScript.h; sourceTree = "<group>"; };
 		501C513A27C0084200DF1DD5 /* HardDiskConfigurator.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HardDiskConfigurator.xib; sourceTree = "<group>"; };
 		501C513E27C0C63A00DF1DD5 /* HardDiskConfigurator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HardDiskConfigurator.swift; sourceTree = "<group>"; };
 		501C514027C0CE6600DF1DD5 /* DriveDescriptors.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = DriveDescriptors.cpp; sourceTree = "<group>"; };
@@ -605,7 +602,6 @@
 		5062DB1124370FE400ACEEE2 /* MyControllerSnapshots.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyControllerSnapshots.swift; sourceTree = "<group>"; };
 		5064850F21EC7A1700FC4AC3 /* Memory.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Memory.cpp; sourceTree = "<group>"; };
 		5064851021EC7A1700FC4AC3 /* Memory.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Memory.h; sourceTree = "<group>"; };
-		50672CBC29460FF9004113F5 /* RetroShellDebugCmds.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RetroShellDebugCmds.cpp; sourceTree = "<group>"; };
 		50672CBF2946100F004113F5 /* InterpreterDebugCmds.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = InterpreterDebugCmds.cpp; sourceTree = "<group>"; };
 		506ACE43279AC75100BA7877 /* SequencerDas.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SequencerDas.cpp; sourceTree = "<group>"; };
 		506ACE45279AC76700BA7877 /* SequencerBpl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SequencerBpl.cpp; sourceTree = "<group>"; };
@@ -716,7 +712,6 @@
 		509C365C260B177E004F160A /* Interpreter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Interpreter.cpp; sourceTree = "<group>"; };
 		509C365D260B177E004F160A /* Interpreter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Interpreter.h; sourceTree = "<group>"; };
 		509C3662260B1D95004F160A /* InterpreterCmds.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = InterpreterCmds.cpp; sourceTree = "<group>"; };
-		509C3667260B3ED0004F160A /* RetroShellCmds.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RetroShellCmds.cpp; sourceTree = "<group>"; };
 		509C66772551577D0028D497 /* Folder.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Folder.cpp; sourceTree = "<group>"; };
 		509C66782551577D0028D497 /* Folder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Folder.h; sourceTree = "<group>"; };
 		509CF4CC22083F9800C500F0 /* CPUPanel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CPUPanel.swift; sourceTree = "<group>"; };
@@ -745,7 +740,7 @@
 		50A6145A260D14FE00A01428 /* ErrorTypes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ErrorTypes.h; sourceTree = "<group>"; };
 		50A61461260DB7F900A01428 /* Parser.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Parser.cpp; sourceTree = "<group>"; };
 		50A61462260DB7F900A01428 /* Parser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Parser.h; sourceTree = "<group>"; };
-		50A61468260DC2D700A01428 /* AmigaComponentTypes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AmigaComponentTypes.h; sourceTree = "<group>"; };
+		50A61468260DC2D700A01428 /* CoreComponentTypes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CoreComponentTypes.h; sourceTree = "<group>"; };
 		50A6146E260DC91600A01428 /* BootBlockImageTypes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BootBlockImageTypes.h; sourceTree = "<group>"; };
 		50A61470260DCA6200A01428 /* RomFileTypes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RomFileTypes.h; sourceTree = "<group>"; };
 		50A64B94257A63A600442964 /* BootBlockImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BootBlockImage.h; sourceTree = "<group>"; };
@@ -787,11 +782,11 @@
 		50AFEBBF278EF70C00F422D5 /* CMakeLists.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
 		50AFEBC1278EFB9700F422D5 /* CMakeLists.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
 		50B0AF92222531C500EE3689 /* CopperTableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CopperTableView.swift; sourceTree = "<group>"; };
-		50B14C0521EB218E002E32A6 /* AmigaObject.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = AmigaObject.cpp; sourceTree = "<group>"; };
-		50B14C0621EB218E002E32A6 /* AmigaObject.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AmigaObject.h; sourceTree = "<group>"; };
+		50B14C0521EB218E002E32A6 /* CoreObject.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CoreObject.cpp; sourceTree = "<group>"; };
+		50B14C0621EB218E002E32A6 /* CoreObject.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CoreObject.h; sourceTree = "<group>"; };
 		50B14C0921EB228E002E32A6 /* config.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
-		50B14C0B21EB3708002E32A6 /* AmigaComponent.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = AmigaComponent.cpp; sourceTree = "<group>"; };
-		50B14C0C21EB3708002E32A6 /* AmigaComponent.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AmigaComponent.h; sourceTree = "<group>"; };
+		50B14C0B21EB3708002E32A6 /* CoreComponent.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CoreComponent.cpp; sourceTree = "<group>"; };
+		50B14C0C21EB3708002E32A6 /* CoreComponent.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CoreComponent.h; sourceTree = "<group>"; };
 		50B14C0E21EB410B002E32A6 /* Amiga.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Amiga.cpp; sourceTree = "<group>"; };
 		50B14C0F21EB410B002E32A6 /* Amiga.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Amiga.h; sourceTree = "<group>"; };
 		50B14C1721EB8445002E32A6 /* drive_click.aiff */ = {isa = PBXFileReference; lastKnownFileType = audio.aiff; path = drive_click.aiff; sourceTree = "<group>"; };
@@ -1067,11 +1062,11 @@
 				5039924625B219FC0084B808 /* Error.h */,
 				50AE6F8425D71FBE0004AFBC /* Error.cpp */,
 				507215B025EAF62B00787591 /* Aliases.h */,
-				50B14C0621EB218E002E32A6 /* AmigaObject.h */,
-				50B14C0521EB218E002E32A6 /* AmigaObject.cpp */,
-				50A61468260DC2D700A01428 /* AmigaComponentTypes.h */,
-				50B14C0C21EB3708002E32A6 /* AmigaComponent.h */,
-				50B14C0B21EB3708002E32A6 /* AmigaComponent.cpp */,
+				50B14C0621EB218E002E32A6 /* CoreObject.h */,
+				50B14C0521EB218E002E32A6 /* CoreObject.cpp */,
+				50A61468260DC2D700A01428 /* CoreComponentTypes.h */,
+				50B14C0C21EB3708002E32A6 /* CoreComponent.h */,
+				50B14C0B21EB3708002E32A6 /* CoreComponent.cpp */,
 				50E79BE8232D123000D296FB /* SubComponent.h */,
 				50E79BE7232D123000D296FB /* SubComponent.cpp */,
 				5042F2DE26BE57F700126C05 /* ThreadTypes.h */,
@@ -1413,6 +1408,7 @@
 				50D661862282BE1800D67D88 /* AmigaTypes.h */,
 				50B14C0F21EB410B002E32A6 /* Amiga.h */,
 				50B14C0E21EB410B002E32A6 /* Amiga.cpp */,
+				501C46BA296413C100C4B27B /* SelfTestScript.h */,
 				50FC050027DA205D00C3E566 /* Headless.h */,
 				50FC047427DA108500C3E566 /* Headless.cpp */,
 				50B14C0421EB212E002E32A6 /* Utilities */,
@@ -1758,8 +1754,6 @@
 				50AD904E276F61C40011ECCB /* RetroShellTypes.h */,
 				50B9C427260942D000A86C31 /* RetroShell.h */,
 				50B9C426260942D000A86C31 /* RetroShell.cpp */,
-				509C3667260B3ED0004F160A /* RetroShellCmds.cpp */,
-				50672CBC29460FF9004113F5 /* RetroShellDebugCmds.cpp */,
 				50AD904A276E104E0011ECCB /* TextStorage.h */,
 				50AD904C276E10660011ECCB /* TextStorage.cpp */,
 				509C3659260B1766004F160A /* Command.h */,
@@ -2177,7 +2171,6 @@
 				50C8C44A2607396200F4E012 /* Layer.swift in Sources */,
 				5004C3AA27BD520400A9161A /* HardDrive.cpp in Sources */,
 				50B14C1021EB410B002E32A6 /* Amiga.cpp in Sources */,
-				50672CBD29460FF9004113F5 /* RetroShellDebugCmds.cpp in Sources */,
 				50B35B6222B2382E001A9C17 /* SerialPort.cpp in Sources */,
 				50AE6EDD24D93DC4000AA367 /* CopperRegs.cpp in Sources */,
 				50C2DE4421F756900043FD1B /* MyControllerStatusBar.swift in Sources */,
@@ -2195,7 +2188,7 @@
 				50AEBED324D3D6D10037082D /* StateMachineEvents.cpp in Sources */,
 				508FDFAC21EA1FBC0043D0E9 /* TOD.cpp in Sources */,
 				50F31C292409322F008A54D8 /* CopperPanel.swift in Sources */,
-				50B14C0D21EB3708002E32A6 /* AmigaComponent.cpp in Sources */,
+				50B14C0D21EB3708002E32A6 /* CoreComponent.cpp in Sources */,
 				50894D822593CF4400C0499D /* HIDExtensions.swift in Sources */,
 				5043F6C5221972F90047CC30 /* MyToolbar.swift in Sources */,
 				50384C8621FC6B66006E7748 /* Snapshot.cpp in Sources */,
@@ -2236,14 +2229,13 @@
 				50E2BE33240D418600155AE4 /* MoiraDebugger.cpp in Sources */,
 				509F41EA243B0FF700AD0FE4 /* ScreenshotDialog.swift in Sources */,
 				506D6AB2276C7B2D002C9711 /* StringUtils.cpp in Sources */,
-				509C3668260B3ED0004F160A /* RetroShellCmds.cpp in Sources */,
 				50AE6EE724D9B2C7000AA367 /* StateMachineRegs.cpp in Sources */,
 				508FE02421EA227B0043D0E9 /* GamePadManager.swift in Sources */,
 				5029C6E627CA6209002F6CCC /* FileSystem.cpp in Sources */,
 				50912FFD2525B7AD0049805B /* Recorder.cpp in Sources */,
 				507727EE242F2CE4009D01DA /* iCarousel.m in Sources */,
 				50EB8CCE2530710E0053988A /* VideoExporter.swift in Sources */,
-				50B14C0721EB218E002E32A6 /* AmigaObject.cpp in Sources */,
+				50B14C0721EB218E002E32A6 /* CoreObject.cpp in Sources */,
 				50B36395277760320030A50C /* BlitterPanel.swift in Sources */,
 				508E7F952206CDBD00F7D88C /* CPU.cpp in Sources */,
 				50F0BD2622AF883C001F4616 /* UART.cpp in Sources */,
@@ -2361,7 +2353,7 @@
 				50FC04BB27DA19B200C3E566 /* HardDrive.cpp in Sources */,
 				50FC049B27DA197500C3E566 /* AgnusInfo.cpp in Sources */,
 				50FC04DC27DA1A1400C3E566 /* getbits.c in Sources */,
-				50FC048327DA190400C3E566 /* AmigaObject.cpp in Sources */,
+				50FC048327DA190400C3E566 /* CoreObject.cpp in Sources */,
 				50FC04C027DA19CE00C3E566 /* Keyboard.cpp in Sources */,
 				50FC048A27DA195600C3E566 /* CIARegs.cpp in Sources */,
 				50FC049D27DA197500C3E566 /* AgnusRegs.cpp in Sources */,
@@ -2382,7 +2374,6 @@
 				50FC04A727DA198100C3E566 /* CopperDebugger.cpp in Sources */,
 				50FC04A027DA197A00C3E566 /* Sequencer.cpp in Sources */,
 				50FC048F27DA195D00C3E566 /* PaulaEvents.cpp in Sources */,
-				50672CBE29460FF9004113F5 /* RetroShellDebugCmds.cpp in Sources */,
 				50FC049827DA196C00C3E566 /* Recorder.cpp in Sources */,
 				50FC04CF27DA19F600C3E566 /* FSDescriptors.cpp in Sources */,
 				50FC04BF27DA19CE00C3E566 /* KeyboardEvents.cpp in Sources */,
@@ -2432,7 +2423,7 @@
 				50FC04D627DA1A0000C3E566 /* Command.cpp in Sources */,
 				50FC04E227DA1A1400C3E566 /* u_heavy.c in Sources */,
 				50FC04FD27DA1AAB00C3E566 /* UARTEvents.cpp in Sources */,
-				50FC048027DA190400C3E566 /* AmigaComponent.cpp in Sources */,
+				50FC048027DA190400C3E566 /* CoreComponent.cpp in Sources */,
 				50FC04CD27DA19E900C3E566 /* HDFFile.cpp in Sources */,
 				50FC04EF27DA1A4500C3E566 /* RemoteManager.cpp in Sources */,
 				50FC049027DA196500C3E566 /* Denise.cpp in Sources */,
@@ -2441,7 +2432,6 @@
 				50FC04FF27DA1AB800C3E566 /* Amiga.cpp in Sources */,
 				50FC04A127DA197A00C3E566 /* SequencerInfo.cpp in Sources */,
 				50FC04B827DA19B200C3E566 /* FloppyDrive.cpp in Sources */,
-				50FC04D727DA1A0000C3E566 /* RetroShellCmds.cpp in Sources */,
 				50FC049127DA196500C3E566 /* DeniseInfo.cpp in Sources */,
 				50FC04D927DA1A0000C3E566 /* TextStorage.cpp in Sources */,
 				50FC047827DA129B00C3E566 /* Chrono.cpp in Sources */,
@@ -2713,7 +2703,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 221224;
+				CURRENT_PROJECT_VERSION = 230106;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 3NG65ZLYW7;
 				ENABLE_APP_SANDBOX = NO;
@@ -2733,7 +2723,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 2.3b1;
+				MARKETING_VERSION = 2.3;
 				PRODUCT_BUNDLE_IDENTIFIER = dirkwhoffmann.vAmiga;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Proxy/Bridging-Header.h";
@@ -2752,7 +2742,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 221224;
+				CURRENT_PROJECT_VERSION = 230106;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 3NG65ZLYW7;
 				ENABLE_APP_SANDBOX = NO;
@@ -2770,7 +2760,7 @@
 				);
 				LLVM_LTO = YES_THIN;
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 2.3b1;
+				MARKETING_VERSION = 2.3;
 				PRODUCT_BUNDLE_IDENTIFIER = dirkwhoffmann.vAmiga;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Proxy/Bridging-Header.h";
@@ -2788,7 +2778,7 @@
 				DEVELOPMENT_TEAM = 3NG65ZLYW7;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				MACOSX_DEPLOYMENT_TARGET = 12.1;
+				MACOSX_DEPLOYMENT_TARGET = 12.0;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -2803,7 +2793,7 @@
 				DEVELOPMENT_TEAM = 3NG65ZLYW7;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				MACOSX_DEPLOYMENT_TARGET = 12.1;
+				MACOSX_DEPLOYMENT_TARGET = 12.0;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
diff --git a/vAmiga.xcodeproj/xcshareddata/xcschemes/vAmigaCore.xcscheme b/vAmiga.xcodeproj/xcshareddata/xcschemes/vAmigaCore.xcscheme
index dfe0f45f4..542cc50a8 100644
--- a/vAmiga.xcodeproj/xcshareddata/xcschemes/vAmigaCore.xcscheme
+++ b/vAmiga.xcodeproj/xcshareddata/xcschemes/vAmigaCore.xcscheme
@@ -53,6 +53,14 @@
       <CommandLineArguments>
          <CommandLineArgument
             argument = "/tmp/script.ini"
+            isEnabled = "NO">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "-m"
+            isEnabled = "NO">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "-s"
             isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
diff --git a/vAmiga.xcodeproj/xcuserdata/hoff.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/vAmiga.xcodeproj/xcuserdata/hoff.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index 222dd6bd9..024867fce 100644
--- a/vAmiga.xcodeproj/xcuserdata/hoff.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/vAmiga.xcodeproj/xcuserdata/hoff.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -115,5 +115,49 @@
             type = "65535">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "5F16736F-7D7A-43EC-8802-A7DD86C69203"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Emulator/Base/AmigaComponent.cpp"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "26"
+            endingLineNumber = "26"
+            landmarkName = "AmigaComponent::initialize()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
+         <BreakpointContent
+            uuid = "05E88BAE-DD8E-4F1A-B8F9-EB6FD4F0C0CC"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            breakpointStackSelectionBehavior = "1"
+            scope = "2"
+            stopOnStyle = "0">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "3DE81FC2-E3FF-4F75-A06A-E68785CE3B08"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Emulator/CPU/Moira/Moira.h"
+            startingColumnNumber = "10"
+            endingColumnNumber = "10"
+            startingLineNumber = "167"
+            endingLineNumber = "167"
+            landmarkName = "Moira"
+            landmarkType = "3">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>