diff --git a/src/MarbleWorld.hx b/src/MarbleWorld.hx
index 78653d60..2ef1b552 100644
--- a/src/MarbleWorld.hx
+++ b/src/MarbleWorld.hx
@@ -1480,7 +1480,7 @@ class MarbleWorld extends Scheduler {
 
 		// Show a notification (and play a sound) based on the gems remaining
 		if (this.gemCount == this.totalGems) {
-			string = "You have all the gems, head for the finish!";
+			string = "You have all the diamonds, head for the finish!";
 			// if (!this.rewinding)
 			AudioManager.playSound(ResourceLoader.getResource('data/sound/gotallgems.wav', ResourceLoader.getAudio, this.soundResources));
 
@@ -1491,13 +1491,13 @@ class MarbleWorld extends Scheduler {
 			// 	this.touchFinish(completionOfImpact);
 			// }
 		} else {
-			string = "You picked up a gem.  ";
+			string = "You picked up a diamond.  ";
 
 			var remaining = this.totalGems - this.gemCount;
 			if (remaining == 1) {
-				string += "Only one gem to go!";
+				string += "Only one diamond to go!";
 			} else {
-				string += '${remaining} gems to go!';
+				string += '${remaining} diamonds to go!';
 			}
 
 			// if (!this.rewinding)
@@ -1634,7 +1634,7 @@ class MarbleWorld extends Scheduler {
 
 		if (this.gemCount < this.totalGems) {
 			AudioManager.playSound(ResourceLoader.getResource('data/sound/missinggems.wav', ResourceLoader.getAudio, this.soundResources));
-			displayAlert("You can't finish without all the gems!!");
+			displayAlert("You can't finish without all the diamonds!!");
 		} else {
 			this.endPad.spawnFirework(this.timeState);
 			this.finishTime = this.timeState.clone();
diff --git a/src/gui/OptionsDlg.hx b/src/gui/OptionsDlg.hx
index 225e8a1f..2581d582 100644
--- a/src/gui/OptionsDlg.hx
+++ b/src/gui/OptionsDlg.hx
@@ -328,6 +328,9 @@ class OptionsDlg extends GuiImage {
 			remapDlg.remapCallback = (key) -> {
 				MarbleGame.canvas.popDialog(remapDlg);
 
+				if (key == Key.ESCAPE)
+					return;
+
 				var conflicting = getConflictingBinding(bindingName, key);
 				if (conflicting == null) {
 					ctrl.txtCtrl.text.text = Util.getKeyForButton2(key);
diff --git a/src/gui/RemapDlg.hx b/src/gui/RemapDlg.hx
index 3cf82b7c..4484fd9f 100644
--- a/src/gui/RemapDlg.hx
+++ b/src/gui/RemapDlg.hx
@@ -43,9 +43,9 @@ class RemapDlg extends GuiControl {
 	public override function update(dt:Float, mouseState:MouseState) {
 		super.update(dt, mouseState);
 		for (i in 0...1024) {
-			if (i == 5)
+			if (i == Key.MOUSE_WHEEL_DOWN || i == Key.MOUSE_WHEEL_UP)
 				continue;
-			if (Key.isDown(i)) {
+			if (Key.isPressed(i)) {
 				remapCallback(i);
 			}
 		}