diff --git a/aima-all/build.properties b/aima-all/build.properties
index 548c8b19ba..428a6b690f 100644
--- a/aima-all/build.properties
+++ b/aima-all/build.properties
@@ -7,7 +7,7 @@
 #   b) Use -Dproperty=value arguments
 
 # VERSION
-aima-all.version=1.9.0-Search-and-JavaFX
+aima-all.version=1.9.1-Search-and-JavaFX
 # DIRECTORY LOCATIONS
 path.to.aima-core.project=../aima-core
 path.to.aima-gui.project=../aima-gui
diff --git a/aima-all/build.xml b/aima-all/build.xml
index 96223a8aae..4f978bf443 100644
--- a/aima-all/build.xml
+++ b/aima-all/build.xml
@@ -24,7 +24,7 @@
 	
 	<target name="aima-all.release" depends="aima-all.makedirs,aima-core.release,aima-gui.release,aimax-osm.release">
 		<copy todir="${aima-all.dir.build.release}/aima-core">
-			<fileset dir="${path.to.aima-core.project}" excludes="**/*.git, .gitignore, build/, bin/" />
+			<fileset dir="${path.to.aima-core.project}" excludes="**/*.git, .gitignore, build/, bin/, target/" />
 		</copy>
 		<copy todir="${aima-all.dir.build.release}/aima-gui">
 			<fileset dir="${path.to.aima-gui.project}" excludes="**/*.git, .gitignore, build/ bin/" />
diff --git a/aima-core/README.txt b/aima-core/README.txt
index 60716ff5d8..35213f95e8 100644
--- a/aima-core/README.txt
+++ b/aima-core/README.txt
@@ -3,11 +3,10 @@
 == Requirements ==
 # JDK 1.8 - is the baseline JDK against which this project is developed. 
 
-== Current Release: 0.12.0-Search-Improvements ==
-0.12.0-Search-Improvements : Dec 18 2016 :<br>
-  * Improvements/Simplifications across search related APIs.
-  * Complete set of algorithms for Chapters 22, 23 and 25 added.
-  * Moved from JDK-7 to 8 as the baseline for further development.
+== Current Release: 3.0.0-Search-Improvements ==
+3.0.0-Search-Improvements : Dec 18 2016 :<br>
+  * Releasing as a full version number, corresponding to 3rd edition of book 
+    (i.e. all 3rd edition releases will start with 3.x.x going forward).
  
 = Details =
 
@@ -109,6 +108,11 @@ The Perceptron and DecisionTreeLearners work on *numerized datasets*. If you int
 2. Learners all implement the Learner interface with 3 methods, train, predict and test. If you want to add a new type of Learner (a partitioning Decision Tree learner perhaps?) you need to implement this interface.
 
 = Change History (Update in reverse chronological order) =
+0.12.0-Search-Improvements : Dec 18 2016 :<br>
+  * Improvements/Simplifications across search related APIs.
+  * Complete set of algorithms for Chapters 22, 23 and 25 added.
+  * Moved from JDK-7 to 8 as the baseline for further development.
+  
 0.11.1-Chp7-Complete : Mar 15 2015 :<br>
   * Fixed Issue 33, Add implementation of - Fig 7.22 SATPlan
   * Improved performance of DPLL implementation and added an alternative implementation that uses a couple
diff --git a/aima-core/build.properties b/aima-core/build.properties
index 3312968904..a80a6083d7 100644
--- a/aima-core/build.properties
+++ b/aima-core/build.properties
@@ -7,7 +7,7 @@
 #   b) Use -Dproperty=value arguments
 
 # VERSION
-aima-core.version=0.12.0
+aima-core.version=3.0.0
 # DIRECTORY LOCATIONS
 aima-core.dir.src=${aima-core.basedir}/src
 aima-core.dir.lib=${aima-core.basedir}/lib
diff --git a/aima-core/pom.xml b/aima-core/pom.xml
index 7b641f6d48..1bcab6c522 100644
--- a/aima-core/pom.xml
+++ b/aima-core/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<name>AIMA-Java Core</name>
-	<version>0.12.0</version>
+	<version>3.0.0</version>
 	<groupId>com.googlecode.aima-java</groupId>
 	<artifactId>aima-core</artifactId>
 
diff --git a/aima-gui/README.txt b/aima-gui/README.txt
index 68ce49791b..e45d9a2c0d 100644
--- a/aima-gui/README.txt
+++ b/aima-gui/README.txt
@@ -16,15 +16,9 @@ They use different frameworks (sub-package framework) and also differ in functio
 == Requirements ==
 # Depends on the aima-core project. 
 
-== Current Release: 1.1.0-AIMA-GUI JavaFX GUIs Added ==
-1.1.0-JavaFX GUIs Added : 18 Dec 2016 :<br>
-  * Java FX based GUIs added.
-  * Simulated Annealing, FX based, Application Added.
-  * Genetic Algorithm, FX based, Application Added.
-  * Updated to work with the latest version of aima-core (0.12.0).
-      * Search Framework improvements.
-      * Bidirectional Search options added to GUI demo applications.
-  * Monte Carlo Localization (MCL), Swing based, Application Added.
+== Current Release: 1.1.1-AIMA-GUI JavaFX GUIs Added ==
+1.1.1-JavaFX GUIs Added : 18 Dec 2016 :<br>
+  * Fixed Jar to launch JavaFX Integrated App by default.
   
 == Running the GUIs and Command Line Demos ==
 Under the release/ directory you should find two jar files, aima-core.jar and aima-gui.jar, ensure these are on your CLASSPATH, the different GUI programs that can be run using these are:
@@ -61,6 +55,15 @@ The following command line demos can be run as well:
  
 
 = Change History (Update in reverse chronological order) =
+1.1.0-JavaFX GUIs Added : 18 Dec 2016 :<br>
+  * Java FX based GUIs added.
+  * Simulated Annealing, FX based, Application Added.
+  * Genetic Algorithm, FX based, Application Added.
+  * Updated to work with the latest version of aima-core (0.12.0).
+      * Search Framework improvements.
+      * Bidirectional Search options added to GUI demo applications.
+  * Monte Carlo Localization (MCL), Swing based, Application Added.
+  
 1.0.9-Chp 7 Rewrite Support : 10 Aug 2014 :<br>
   * Updated to work with the latest version of aima-core (0.11.0).
   
diff --git a/aima-gui/build.properties b/aima-gui/build.properties
index 95ebf718c7..c43b6b340f 100644
--- a/aima-gui/build.properties
+++ b/aima-gui/build.properties
@@ -7,7 +7,7 @@
 #   b) Use -Dproperty=value arguments
 
 # VERSION
-aima-gui.version=1.1.0
+aima-gui.version=1.1.1
 # DIRECTORY LOCATIONS
 path.to.aima-core.project=../aima-core
 aima-gui.dir.src=${aima-gui.basedir}/src
diff --git a/aima-gui/build.xml b/aima-gui/build.xml
index 76de1502ed..9b6712034f 100644
--- a/aima-gui/build.xml
+++ b/aima-gui/build.xml
@@ -6,7 +6,7 @@
 
 	<import file="${path.to.aima-core.project}/build.xml"/>
 	
-	<property name="aima-gui.run" value="aima.gui.swing.applications.IntegratedAimaApp" />
+	<property name="aima-gui.run" value="aima.gui.fx.applications.IntegratedAimaFxApp" />
 	
 	<path id="aima-gui.classpath">
 		<path refid="aima-core.classpath" />
@@ -53,7 +53,7 @@
 		<jar destfile="${aima-gui.dir.build.release}/aima-gui.jar">
 			<manifest>
 				<attribute name="Class-Path" value="aima-core.jar" />
-				<attribute name="Main-Class" value="aima.gui.applications.AimaDemoApp" />
+				<attribute name="Main-Class" value="aima.gui.fx.applications.IntegratedAimaFxApp" />
 		    	<attribute name="Implementation-Title" value="AIMA-GUI" />
 		        <attribute name="Implementation-Version" value="${aima-gui.version}" />
 		        <attribute name="AIMA-GUI-Version" value="${aima-gui.version}" />
diff --git a/aimax-osm/README.txt b/aimax-osm/README.txt
index df313b158a..2bfac8dfc9 100644
--- a/aimax-osm/README.txt
+++ b/aimax-osm/README.txt
@@ -67,11 +67,9 @@ for navigation, mark setting, and track definition. For routing, at least two
 markers must be set.
 
 
-== Current Release: 2.1.0-AIMAX-OSM JavaFX GUIs Added == 
-2.1.0-AIMAX-OSM JavaFX GUIs Added : 18 Dec 2016 :<br>
-   * JavaFX GUIs Added.
-   * Reverse map problem generation improved.
-   * Minor documentation improvements.
+== Current Release: 2.1.1-AIMAX-OSM JavaFX GUIs Added == 
+2.1.1-AIMAX-OSM JavaFX GUIs Added : 18 Dec 2016 :<br>
+  * Fixed Jar to launch JavaFX Integrated App by default.
 
 == Keywords ==
 
@@ -154,6 +152,11 @@ program argument -screensize=xx (with xx screen size in inch)
 
   
 = Change History (Update in reverse chronological order) =
+2.1.0-AIMAX-OSM JavaFX GUIs Added : 18 Dec 2016 :<br>
+   * JavaFX GUIs Added.
+   * Reverse map problem generation improved.
+   * Minor documentation improvements.
+   
 2.0.3-AIMAX-OSM Small Improvements : 10 Aug 2014 :<br>
    * One way arrows added.
    * Map renderer is now platform independent. Can also be used for Android. Beta Version!
diff --git a/aimax-osm/build.properties b/aimax-osm/build.properties
index a110bb52e1..7ddc478d6a 100644
--- a/aimax-osm/build.properties
+++ b/aimax-osm/build.properties
@@ -7,7 +7,7 @@
 #   b) Use -Dproperty=value arguments
 
 # VERSION
-aimax-osm.version=2.1.0
+aimax-osm.version=2.1.1
 # DIRECTORY LOCATIONS
 path.to.aima-gui.project=../aima-gui
 aimax-osm.dir.src=${aimax-osm.basedir}/src
diff --git a/aimax-osm/build.xml b/aimax-osm/build.xml
index 4771f7513c..801414502f 100644
--- a/aimax-osm/build.xml
+++ b/aimax-osm/build.xml
@@ -6,7 +6,7 @@
 
 	<import file="${path.to.aima-gui.project}/build.xml"/>
 	
-	<property name="aimax-osm.run" value="aimax.osm.gui.swing.IntegratedAimaOsmApp" />
+	<property name="aimax-osm.run" value="aimax.osm.gui.fx.IntegratedAimaOsmFxApp" />
 	
 	<path id="aimax-osm.classpath">
 		<path refid="aima-gui.classpath" />
@@ -53,7 +53,7 @@
 		<jar destfile="${aimax-osm.dir.build.release}/aimax-osm.jar">
 			<manifest>
 				<attribute name="Class-Path" value="aima-gui.jar commons-compress-1.1.jar" />
-				<attribute name="Main-Class" value="aimax.osm.gui.swing.applications.OsmViewerApp" />
+				<attribute name="Main-Class" value="aimax.osm.gui.fx.IntegratedAimaOsmFxApp" />
 		    	<attribute name="Implementation-Title" value="AIMAX-OSM" />
 		        <attribute name="Implementation-Version" value="${aimax-osm.version}" />
 		        <attribute name="AIMAX-OSM-Version" value="${aimax-osm.version}" />