diff --git a/OpenRa.Game/Sidebar.cs b/OpenRa.Game/Sidebar.cs
index 27bf82e4be..dfcc0e8e64 100644
--- a/OpenRa.Game/Sidebar.cs
+++ b/OpenRa.Game/Sidebar.cs
@@ -151,7 +151,15 @@ namespace OpenRa.Game
 					clockRenderer.DrawSprite( clockAnimations[ group ].Image, region.Location.ToFloat2() + i.location, 0 );
 
 					if (producing.Done)
+					{
+						ready.Play("ready");
 						clockRenderer.DrawSprite(ready.Image, region.Location.ToFloat2() + i.location + new float2((64 - ready.Image.size.X) / 2, 2), 0);
+					}
+					else if (producing.Paused)
+					{
+						ready.Play("hold");
+						clockRenderer.DrawSprite(ready.Image, region.Location.ToFloat2() + i.location + new float2((64 - ready.Image.size.X) / 2, 2), 0);
+					}
 				}
 				else if (producing != null)
 					clockRenderer.DrawSprite(cantBuild.Image, region.Location.ToFloat2() + i.location, 0);
@@ -206,10 +214,14 @@ namespace OpenRa.Game
 			if( item == null )
 				return;
 
+			string group = Rules.UnitCategory[item.Tag];
+			var producing = player.Producing(group);
+
 			if( mi.Button == MouseButtons.Left && mi.Event == MouseInputEvent.Down )
             {
-				string group = Rules.UnitCategory[ item.Tag ];
-				var producing = player.Producing(group);
+				/* todo: move all this shit elsewhere! we can't have it in the UI if it's going to be
+				 * correct in netplay!! */
+				
 				if (producing == null)
 				{
 					var ui = Rules.UnitInfo[item.Tag];
@@ -225,15 +237,35 @@ namespace OpenRa.Game
 
 					player.BeginProduction(group,
 						new ProductionItem(item.Tag, (int)time, ui.Cost, complete));
+
+					Game.PlaySound("abldgin1.aud", false);
 				}
-				else if (producing.Item == item.Tag && producing.Done)
+				else if (producing.Item == item.Tag)
 				{
-					Build(item);
+					if (producing.Done)
+						Build(item);
+					else
+						producing.Paused = false;
+				}
+				else
+				{
+					Game.PlaySound("progres1.aud", false);
 				}
             }
 			else if (mi.Button == MouseButtons.Right && mi.Event == MouseInputEvent.Down)
 			{
-				player.CancelProduction(Rules.UnitCategory[item.Tag]);
+				if (item.Tag != producing.Item) return;
+
+				if (producing.Paused || producing.Done)
+				{
+					Game.PlaySound("cancld1.aud", false);
+					player.CancelProduction(Rules.UnitCategory[item.Tag]);
+				}
+				else
+				{
+					Game.PlaySound("onhold1.aud", false);
+					producing.Paused = true;
+				}
 			}
 		}
 	}
diff --git a/OpenRa.Game/UnitOrders.cs b/OpenRa.Game/UnitOrders.cs
index f4712ef228..014238c5f9 100755
--- a/OpenRa.Game/UnitOrders.cs
+++ b/OpenRa.Game/UnitOrders.cs
@@ -53,9 +53,11 @@ namespace OpenRa.Game
 			case "DeliverOre":
 				{
 					var mobile = order.Subject.traits.Get<Mobile>();
+					mobile.Cancel(order.Subject);
 					mobile.QueueActivity(new Mobile.MoveTo(order.TargetActor.Location + new int2(1, 2)));
 					mobile.QueueActivity(new Mobile.Turn(64));
-					/* todo: actual deliver activity! */
+
+					/* todo: actual deliver activity! [animation + add cash] */
 					break;
 				}
 			case "PlaceBuilding":