diff --git a/DataExtractionOSM/build.xml b/DataExtractionOSM/build.xml
index d8fe6115ad..9ef8a745b5 100644
--- a/DataExtractionOSM/build.xml
+++ b/DataExtractionOSM/build.xml
@@ -7,12 +7,12 @@
 				<include name="*.jar"/>
 			</fileset>
 		</path>
-		<manifestclasspath property="lib.list" jarfile="DataExtractionOSM.jar">
+		<manifestclasspath property="lib.list" jarfile="OsmAndMapCreator.jar">
 			<classpath refid="build-classpath"/>
 		</manifestclasspath>
 		<echo>list is  ${lib.list}</echo>
 
-		<delete file="DataExtractionOSM.jar" />
+		<delete file="OsmAndMapCreator.jar" />
 		<delete file="MANIFEST.MF" />
 		<manifest file="MANIFEST.MF">
 			<attribute name="Built-By" value="${user.name}" />
@@ -20,7 +20,7 @@
 			<attribute name="Class-Path" value="${lib.list}"/>
 		</manifest>
 
-		<jar destfile="DataExtractionOSM.jar" manifest="MANIFEST.MF">
+		<jar destfile="OsmAndMapCreator.jar" manifest="MANIFEST.MF">
 			<fileset dir="bin">
 				<include name="**/*.class" />
 			</fileset>
@@ -28,10 +28,22 @@
 				<include name="**/*.java" />
 			</fileset>
 		</jar>
+		
 		<delete file="MANIFEST.MF" />
 	</target>
-	<target name="build" depends="jar" />
-
+	
+	<target name="build" depends="jar">
+		<delete dir="build"/>
+		<copy todir="build">
+			<fileset dir=".">
+				<include name="OsmAndMapCreator.jar"/>
+				<include name="lib/**"/>
+				<include name="run.bat"/>
+				<include name="run.sh"/>
+			</fileset>
+		</copy>
+		<delete file="OsmAndMapCreator.jar" />
+	</target>
 
 </project>
 
diff --git a/DataExtractionOSM/run.bat b/DataExtractionOSM/run.bat
index c08c572150..1361d08eac 100644
--- a/DataExtractionOSM/run.bat
+++ b/DataExtractionOSM/run.bat
@@ -1 +1,4 @@
-java -jar DataExtractionOSM.jar
\ No newline at end of file
+REM the JVM. With the below settings the heap size (Available memory for the application)
+REM will range from 64 megabyte up to 512 megabyte.
+
+start javaw.exe -jar OsmAndMapCreator.jar -Xms64M -Xmx512M
\ No newline at end of file
diff --git a/DataExtractionOSM/run.sh b/DataExtractionOSM/run.sh
new file mode 100644
index 0000000000..905050502e
--- /dev/null
+++ b/DataExtractionOSM/run.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# This file will start the Osm Extraction UI with custom memory settings for
+# the JVM. With the below settings the heap size (Available memory for the application)
+# will range from 64 megabyte up to 512 megabyte.
+
+java -jar OsmAndMapCreator.jar -Xms64M -Xmx512M
\ No newline at end of file
diff --git a/DataExtractionOSM/src/com/osmand/ToDoConstants.java b/DataExtractionOSM/src/com/osmand/ToDoConstants.java
index 69c4ba48a9..7909339b8d 100644
--- a/DataExtractionOSM/src/com/osmand/ToDoConstants.java
+++ b/DataExtractionOSM/src/com/osmand/ToDoConstants.java
@@ -14,9 +14,6 @@ public class ToDoConstants {
 	// it is not editable in editor ?
 	public int MAKE_MAP_PANEL_EDITABLE_IN_EDITOR = 4;
 	
-	// common parts : work with cache on file system & in memory
-	public int EXTRACT_COMMON_PARTS_FROM_MAPPANEL_AND_OSMMAPVIEW = 5;
-	
 	/**
 	 * Write activity to show something about authors / donation ....
 	 */
@@ -32,12 +29,13 @@ public class ToDoConstants {
 	// 5. Enable city/streets/buildings index
 	// 7. Search for city/streets/buildings!
 	// 8. Enable change POI directly on map
-	// 9. Log to see when exception occured(android)
+	// 9. Log to see when exception occurred (android)
 	// 10. Specify auto-rotating map (compass).
 	// 11. Print out additional info speed, altitude, number of satellites
 	// 12. Show point where are you going (the arrow not the point)
-	// 13. Save point as favourit
+	// 13. Save point as favorite
 	// 14. Show zoom level directly on map
+	// 15. Investigate interruption of progress (is it available & how to support it) 
 	// -------------------
 	
 	// BUGS Androd :
@@ -47,14 +45,15 @@ public class ToDoConstants {
 	
 	/// SWING version : 
 	// TODO : 
-	// 1. Add preferences dialog (use internet, )
-	// 3. download tiles without using dir tiles
-	// 4. Config file log & see log from file
-	// 6. Predefine before file loading what should be extracted from osm (building, poi or roads)
-	// 7. Fix TODO in files (accept amenity - way)
-	// 9. Normalizing streets
-	// 10. Reinvent index mechanism (save in zip file with tile indexes, save city/town addresses separately, read partially !)
-	// 11. Street setName() change in city index!
-	// 12. Invent different file extensions for poi.index, address.index,...
+	// 0. Create build.xml & build product for release purposes 
+	// 1. Add preferences dialog (use internet, Normalizing streets) !!!
+	// 2. Predefine before file loading what should be extracted from osm (building, poi or roads) !
+	// 3. Fix TODO in files (accept amenity - way)
+	// 4. Interrupt thread when progress dialog is closed
+	
+	// 5. download tiles without using dir tiles
+	// 6. Config file log & see log from file
+	// 7. Reinvent index mechanism (save in zip file with tile indexes, save city/town addresses separately, read partially !)
+	// 8. Invent different file extensions for poi.index, address.index,...
 
 }
diff --git a/DataExtractionOSM/src/com/osmand/swing/MapPanel.java b/DataExtractionOSM/src/com/osmand/swing/MapPanel.java
index 70a8903d6d..a9d30021d8 100644
--- a/DataExtractionOSM/src/com/osmand/swing/MapPanel.java
+++ b/DataExtractionOSM/src/com/osmand/swing/MapPanel.java
@@ -248,9 +248,7 @@ public class MapPanel extends JPanel implements IMapDownloaderCallback {
 		int[] yPoints = new int[4];
 		for (Line2D p : linesToDraw) {
 			AffineTransform transform = new AffineTransform();
-			
 			transform.translate(p.getX1(), p.getY1());
-//			transform.scale(p.getX2() - p.getX1(), p.getY2() - p.getY1());
 			transform.rotate(p.getX2() - p.getX1(), p.getY2() - p.getY1());
 			xPoints[1] = xPoints[0] = 0;
 			xPoints[2] = xPoints[3] = (int) Math.sqrt((p.getX2() - p.getX1())*(p.getX2() - p.getX1()) +