diff --git a/Client/src/org/runite/jagex/MouseListeningClass.java b/Client/src/org/runite/jagex/MouseListeningClass.java
index 495e80022..400453a3c 100644
--- a/Client/src/org/runite/jagex/MouseListeningClass.java
+++ b/Client/src/org/runite/jagex/MouseListeningClass.java
@@ -222,7 +222,7 @@ final class MouseListeningClass implements MouseListener, MouseMotionListener, F
 	  {
 	    try
 	    {
-	      if (var1.getButton() == 2)
+	      if (SwingUtilities.isMiddleMouseButton(var1))
 	      {
 	        this.mouseWheelX = var1.getX();
 	        this.mouseWheelY = var1.getY();
@@ -234,16 +234,16 @@ final class MouseListeningClass implements MouseListener, MouseMotionListener, F
 	        RenderAnimationDefinition.anInt362 = var1.getX();
 	        Class3_Sub13_Sub32.anInt3389 = var1.getY();
 	        Class140_Sub6.aLong2926 = Class5.method830((byte)-55);
-	        if (!var1.isMetaDown())
+	        if (var1.getButton() == MouseEvent.BUTTON3) // SwingUtilities.isRightMouseButton(var1)
 	        {
-	          Class140_Sub3.anInt2743 = 1;
-	          GraphicDefinition.anInt549 = 1;
+				Class140_Sub3.anInt2743 = 2;
+				GraphicDefinition.anInt549 = 2;
 	        }
-	        else
+	        else if (SwingUtilities.isLeftMouseButton(var1))
 	        {
-	          Class140_Sub3.anInt2743 = 2;
-	          GraphicDefinition.anInt549 = 2;
-	        }
+				Class140_Sub3.anInt2743 = 1;
+				GraphicDefinition.anInt549 = 1;
+			}
 	        int var2 = var1.getModifiers();
 	        if (((var2 & 0x10) == 0) && (
 	        
diff --git a/Server/src/plugin/command/PlayerCommandPlugin.java b/Server/src/plugin/command/PlayerCommandPlugin.java
index 8d484ec0a..3f9a4073d 100644
--- a/Server/src/plugin/command/PlayerCommandPlugin.java
+++ b/Server/src/plugin/command/PlayerCommandPlugin.java
@@ -241,10 +241,6 @@ public final class PlayerCommandPlugin extends CommandPlugin {
 		player.getPacketDispatch().sendString("<col=2c3e50>Get online player count.", 275, lineId++);
 		player.getPacketDispatch().sendString("<col=ecf0f1>::quests", 275, lineId++);
 		player.getPacketDispatch().sendString("<col=2c3e50>Shows a list of all available quests.", 275, lineId++);
-		player.getPacketDispatch().sendString("<col=ecf0f1>::shop", 275, lineId++);
-		player.getPacketDispatch().sendString("<col=2c3e50>Open the reward credits shop.", 275, lineId++);
-		player.getPacketDispatch().sendString("<col=ecf0f1>::credits", 275, lineId++);
-		player.getPacketDispatch().sendString("<col=2c3e50>Get your reward credits balance.", 275, lineId++);
 		player.getPacketDispatch().sendString("<col=ecf0f1>::togglenews", 275, lineId++);
 		player.getPacketDispatch().sendString("<col=2c3e50>Toggles the news broadcasts.", 275, lineId++);
 		player.getPacketDispatch().sendString("<col=ecf0f1>::toggleatk", 275, lineId++);