diff --git a/libs/core/_locales/core-jsdoc-strings.json b/libs/core/_locales/core-jsdoc-strings.json
index 55d6c3e1..fd0619b0 100644
--- a/libs/core/_locales/core-jsdoc-strings.json
+++ b/libs/core/_locales/core-jsdoc-strings.json
@@ -169,9 +169,9 @@
   "led.unplot|param|x": "TODO",
   "led.unplot|param|y": "TODO",
   "motors": "Blocks to control the onboard motors",
-  "motors.dualMotorPower": "Controls two motors attached to the board.",
-  "motors.motorCommand": "Send break, coast or sleep commands to the motor",
-  "motors.motorPower": "Turns on the motor at a certain percent of power.",
+  "motors.dualMotorPower": "Controls two motors attached to the board. Switches to dual-motor mode!",
+  "motors.motorCommand": "Send break, coast or sleep commands to the motor. Has no effect in dual-motor mode.",
+  "motors.motorPower": "Turns on the motor at a certain percent of power. Switches to single motor mode!",
   "motors.motorPower|param|power": "%percent of power sent to the motor. Negative power goes backward. eg: 50",
   "music": "Generation of music tones through pin ``P0``.",
   "music.beat": "Returns the duration of a beat in milli-seconds",
@@ -180,7 +180,6 @@
   "music.noteFrequency": "Gets the frequency of a note.",
   "music.noteFrequency|param|name": "the note name",
   "music.playTone": "Plays a tone through ``speaker`` for the given duration.",
-  "music.playTone|param|frequency": "pitch of the tone to play in Hertz (Hz)",
   "music.playTone|param|ms": "tone duration in milliseconds (ms)",
   "music.rest": "Rests (plays nothing) for a specified time through pin ``P0``.",
   "music.rest|param|ms": "rest duration in milliseconds (ms)",
diff --git a/libs/core/dal.d.ts b/libs/core/dal.d.ts
index 3acb7d7e..703ef35d 100644
--- a/libs/core/dal.d.ts
+++ b/libs/core/dal.d.ts
@@ -153,6 +153,9 @@ declare const enum DAL {
     CALLIOPE_ID_IO_P14 = 38,
     CALLIOPE_ID_IO_P15 = 39,
     CALLIOPE_ID_IO_P22 = 40,
+    CALLIOPE_ID_IO_P28 = 41,
+    CALLIOPE_ID_IO_P29 = 42,
+    CALLIOPE_ID_IO_P30 = 43,
     MICROBIT_ID_MESSAGE_BUS_LISTENER = 1021,
     MICROBIT_ID_NOTIFY_ONE = 1022,
     MICROBIT_ID_NOTIFY = 1023,
@@ -428,7 +431,6 @@ declare const enum DAL {
     MICROBIT_ACCELEROMETER_FREEFALL_TOLERANCE = 400,
     MICROBIT_ACCELEROMETER_SHAKE_TOLERANCE = 400,
     MICROBIT_ACCELEROMETER_2G_TOLERANCE = 2048,
-    MICROBIT_ACCELEROMETER_3G_TOLERANCE = 3072,
     MICROBIT_ACCELEROMETER_6G_TOLERANCE = 6144,
     MICROBIT_ACCELEROMETER_8G_TOLERANCE = 8192,
     MICROBIT_ACCELEROMETER_GESTURE_DAMPING = 5,
diff --git a/libs/core/pxtparts.json b/libs/core/pxtparts.json
index 8c0426ed..1a9d5cb4 100644
--- a/libs/core/pxtparts.json
+++ b/libs/core/pxtparts.json
@@ -185,7 +185,7 @@
             "pinDistance": 65,
             "pinLocations": [
                 {"x": 89, "y": 48},
-                {"x": 395, "y": 48}            ]
+                {"x": 393, "y": 48}            ]
         },
         "pinDefinitions": [
             { "target": "M_OUT1", "style": "croc", "orientation": "-Z"},
diff --git a/pxtarget.json b/pxtarget.json
index c81778b0..4f8ec1ba 100644
--- a/pxtarget.json
+++ b/pxtarget.json
@@ -60,7 +60,7 @@
         "autoRun": true,
         "streams": true,
         "aspectRatio": 1.13,
-        "parts": true,
+        "parts": false,
         "partsAspectRatio": 0.69,
         "boardDefinition": {
             "visual": "calliope",
diff --git a/sim/state/accelerometer.ts b/sim/state/accelerometer.ts
index 8bc42bd4..b1a01257 100644
--- a/sim/state/accelerometer.ts
+++ b/sim/state/accelerometer.ts
@@ -199,8 +199,9 @@ namespace pxsim {
             if (force < sq(DAL.MICROBIT_ACCELEROMETER_FREEFALL_TOLERANCE))
                 return DAL.MICROBIT_ACCELEROMETER_EVT_FREEFALL;
 
-            if (force > sq(DAL.MICROBIT_ACCELEROMETER_3G_TOLERANCE))
-                return DAL.MICROBIT_ACCELEROMETER_EVT_3G;
+            // TODO: fix this
+            //if (force > sq(DAL.MICROBIT_ACCELEROMETER_3G_TOLERANCE))
+            //    return DAL.MICROBIT_ACCELEROMETER_EVT_3G;
 
             if (force > sq(DAL.MICROBIT_ACCELEROMETER_6G_TOLERANCE))
                 return DAL.MICROBIT_ACCELEROMETER_EVT_6G;