===================================================================
--- original.js
+++ change.js
@@ -616,13 +616,16 @@
 			self.selectionCircle.alpha = 0.9;
 		}
 		var centerDeltaX = (gameMap.currentViewCenter.x - 15) * 100;
 		var centerDeltaY = (gameMap.currentViewCenter.y - 15) * 100;
-		var cellElt = screenCoordToWorldCell(element.x, element.y);
+		//var cellElt = screenCoordToWorldCell(element.x, element.y);
+		var cellElt = worldCoordToScreenCell(element.x, element.y);
+		console.log("element at : " + element.x + ',' + element.y);
 		//self.x = element.x - centerDeltaX + elementDeltaX;
 		//self.y = element.y - centerDeltaY + elementDeltaY;
-		self.x = cellElt.wCellX + elementDeltaX;
-		self.y = cellElt.wCellY + elementDeltaY;
+		self.x = cellElt.cellX * tileSize + elementDeltaX;
+		self.y = cellElt.cellY * tileSize + elementDeltaY;
+		console.log("SelectionMarker at : " + cellElt.wCellX + ',' + cellElt.wCellY + ' => ' + self.x + ',' + self.y);
 		self.visible = true;
 	};
 	self.hide = function () {
 		console.log('SelectionMarker hidden');
@@ -1254,8 +1257,9 @@
 	}
 }
 //#region Event listeners
 var dragStart = null;
+var dragDelta = 0;
 function handleDragStart(obj) {
 	console.log("Drag start...");
 	dragStart = obj.event.getLocalPosition(game);
 }
@@ -1304,8 +1308,10 @@
 			unit.x += deltaX * tileSize;
 			unit.y += deltaY * tileSize;
 		});
 		gameMap.handleDrag(inputPosition);
+		dragDelta = Math.sqrt(deltaX * deltaX + deltaY * deltaY);
+		//selectionMarker.setOnElement(currentSelection);
 	}
 }
 function handleDragEnd(obj) {
 	var currentPos = obj.event.getLocalPosition(game);
@@ -1316,8 +1322,9 @@
 	console.log("Clicked at " + input.x + ',' + input.y);
 	if (input.y > game.height * 0.80) {
 		console.log("Clicked on board at " + input.x + ',' + input.y);
 		dragStart = null;
+		dragDelta = 0;
 		return;
 	}
 	if (currentUserActionState === UserActionState.PLACING_BUILDINGS) {
 		var cellCoord = getCellForPlacement(input.x, input.y, currentBuildingForPlacement);
@@ -1330,8 +1337,9 @@
 		console.log("Placing building ", currentBuildingForPlacement, " at " + cellX + ',' + cellY);
 		handleBuildingPlacement(currentBuildingForPlacement, cellX, cellY);
 		currentUserActionState = UserActionState.NAVIGATING;
 		dragStart = null;
+		dragDelta = 0;
 	} else if (currentUserActionState === UserActionState.SET_ORDER_TARGET) {
 		if (currentSelection && currentSelection.isUnit) {
 			var cellCoord = convertCoordsToCell(input.x, input.y);
 			currentSelection.destinationTarget = {
@@ -1355,8 +1363,9 @@
 		}
 		highlightBorder();
 		currentUserActionState = UserActionState.NAVIGATING;
 		dragStart = null;
+		dragDelta = 0;
 	} else {
 		// Normal click
 		var clickCell = screenCoordToWorldCell(input.x, input.y);
 		var cellX = clickCell.wCellX;
@@ -1373,9 +1382,9 @@
 			if (!cell.building && !cell.unit && deltaToSelection > 1) {
 				currentSelection = null;
 				selectionMarker.setOnElement();
 				selectionMarker.hide();
-				console.log("Nothing selected at " + cellX + ',' + cellY, " deltaToSelection=" + deltaToSelection);
+				console.log("Nothing selected at " + cellX + ',' + cellY, " deltaToSelection=" + deltaToSelection, " dragDelta=", dragDelta);
 				updateActionBoard();
 			} else if (cell.building) {
 				console.log("Selected building at " + cellX + ',' + cellY);
 				currentSelection = cell.building;
@@ -1386,8 +1395,9 @@
 				console.log("unit at  " + cell.unit.x + ',' + cell.unit.y);
 			}
 		}
 		dragStart = null;
+		dragDelta = 0;
 	}
 }
 game.on('down', handleDragStart);
 game.on('move', handleDragMove);