diff --git a/CHANGES b/CHANGES
index cbbc17282..afe37f490 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,18 @@ __/\\\\\\\\\\\\\\\___/\\\\\\\\\\\___/\\\\\\\\\\\\\\\___/\\\\\\\\\\\\\\\_
        _\/\\\_______________/\\\\\\\\\\\__\/\\\______________\/\\\\\\\\\\\\\\\_ 
         _\///_______________\///////////___\///_______________\///////////////__
 
+================================================================================
+== 0.3.5  (August 21st, 2013)                                                 ==
+================================================================================
+
+=== Engine ===
+* Fixed another LayerCache bug.
+* Fixed blocking bug, which has affected multi cell objects.
+* Fixed segmentation fault within pathfinder.
+* Fixed segmentation fault within Instance::follow.
+* Fixed the visible/invisible problem. [t:780]
+* Fixed facing location and a related bug. [t:773]
+
 ================================================================================
 == 0.3.4  (February 28th, 2013)                                               ==
 ================================================================================
diff --git a/INSTALL b/INSTALL
index 273365c40..b0ccfc236 100644
--- a/INSTALL
+++ b/INSTALL
@@ -20,7 +20,7 @@ targets work as advertized.
 === Dependencies ===
 A list of all dependencies (including accurate version numbers) that you'll need
 to obtain to build FIFE on your platform can be found at the project wiki:
- * http://wiki.fifengine.net/index.php?title=Build_dependencies
+ * https://github.com/fifengine/fifengine/wiki/dependencies
 
 
 === SCons Build System Notes ===
@@ -64,7 +64,7 @@ Build options:
 === Linux ===
 Detailed information how to build FIFE on Linux-based distributions can be found
 at the project wiki:
- * http://wiki.fifengine.net/index.php?title=Building:Linux:SCons
+ * https://github.com/fifengine/fifengine/wiki/Building-on-linux
 
 After FIFE has been built successfully move into the <FIFE>/demos/rio_de_hola 
 directory and run: 'python run.py'
@@ -72,7 +72,7 @@ directory and run: 'python run.py'
 === OS X ===
 Detailed information how to build FIFE on OS X systems can be found at the 
 project wiki:
- * http://wiki.fifengine.net/index.php?title=Building:Mac:Scons
+ * https://github.com/fifengine/fifengine/wiki/Building-on-osx
 
 After FIFE has been built successfully move into the <FIFE>/demos/rio_de_hola 
 directory and run: 'python run.py'
diff --git a/README b/README
index 5ace6873c..30c6327db 100644
--- a/README
+++ b/README
@@ -10,7 +10,7 @@ __/\\\\\\\\\\\\\\\___/\\\\\\\\\\\___/\\\\\\\\\\\\\\\___/\\\\\\\\\\\\\\\_
         _\///_______________\///////////___\///_______________\///////////////__
         
 == Introduction ==
-Welcome to the FIFE v0.3.4 README. This is based on SVN revision 4103
+Welcome to the FIFE v0.3.5 README.
 
 == Table of contents ==
 1 Features
@@ -25,7 +25,7 @@ Welcome to the FIFE v0.3.4 README. This is based on SVN revision 4103
 == 1) Features ==
 A complete list of the features that FIFE offers can be found at the project 
 wiki:
- * http://wiki.fifengine.net/index.php?title=Engine_features
+ * https://github.com/fifengine/fifengine/wiki/Features
 
 
 == 2) License ==
@@ -72,7 +72,7 @@ root directories.
 NOTE that the settings.xml file is auto generated and wont be there until you
 run the demos for the first time.  FIFE automatically fills the settings file
 with default values.  For more information on FIFE settings please see the wiki
-page here: http://wiki.fifengine.net/Engine_Extensions#Engine_Settings
+page here: https://github.com/fifengine/fifengine/wiki/Engine-settings
 
 == 4) Known issues ==
 Documentation
@@ -139,8 +139,7 @@ We appreciate every kind of feedback concerning the release, the project in
 general and the bundled techdemo. Feedback is a great way to help us to improve 
 FIFE. If you would like to get in contact with us and provide feedback you can 
 either visit our IRC channel or our forums:
- * http://wiki.fifengine.net/index.php?title=IRC
- * http://forums.fifengine.net/index.php?board=5.0
+ * https://github.com/fifengine/fifengine/wiki#community
 
 
 == 7) Closing Notes ==
@@ -149,4 +148,4 @@ Have fun with the release and let us know what you think about it!
 
 http://www.fifengine.net/
 
-2013/02/28
+2013/08/21
diff --git a/build/win32/installer/fife.iss b/build/win32/installer/fife.iss
index 4d2c9a8eb..c7bbe1294 100644
--- a/build/win32/installer/fife.iss
+++ b/build/win32/installer/fife.iss
@@ -6,8 +6,8 @@
 ; Do not use the same AppId value in installers for other applications.
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
 AppId={{8A27DF0C-689B-4B76-8BFC-AFCDD90C1A31}
-AppName=FIFE 0.3.4rc1
-AppVerName=FIFE 0.3.4rc1
+AppName=FIFE 0.3.5
+AppVerName=FIFE 0.3.5
 AppPublisher=FIFE Team
 AppPublisherURL=http://www.fifengine.net/
 AppSupportURL=http://www.fifengine.net/
@@ -20,7 +20,7 @@ AllowNoIcons=yes
 LicenseFile=license.rtf
 Compression=lzma
 SolidCompression=yes
-OutputBaseFilename=FIFE_0.3.4rc1_installer_win32
+OutputBaseFilename=FIFE_0.3.5_installer_win32
 OutputDir=.
 DisableReadyPage=yes
 
@@ -41,7 +41,7 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 [Files]
 
 ; engine
-Source: "..\..\..\dist\*.exe"; DestDir: "{app}\engine"; Excludes: ".svn"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "..\..\..\dist\*.exe"; DestDir: "{app}\engine"; Excludes: ".git,.svn"; Flags: ignoreversion recursesubdirs createallsubdirs
 Source: "..\..\..\AUTHORS"; DestDir: "{app}\doc\"; DestName:"Authors.txt"
 Source: "..\..\..\COPYING"; DestDir: "{app}\doc\"; DestName:"Copying.txt"
 Source: "..\..\..\CHANGES"; DestDir: "{app}\doc\"; DestName:"Changes.txt"
@@ -51,7 +51,7 @@ Source: "..\..\..\README"; DestDir:"{app}"; DestName: "README.txt"; Flags: isrea
 Source: "..\..\..\demos\*"; DestDir: "{app}\demos"; Excludes: "settings.xml,*.7z,rpg,.svn,*.pyc,*.patch"; Flags: ignoreversion recursesubdirs createallsubdirs
 
 ; tools
-Source: "..\..\..\tools\*"; DestDir: "{app}\tools"; Excludes: ".svn,atlas,*.pyc,*.patch"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "..\..\..\tools\*"; DestDir: "{app}\tools"; Excludes: ".git,.svn,atlas,*.pyc,*.patch"; Flags: ignoreversion recursesubdirs createallsubdirs
 
 [Icons]
 Name: "{group}\{cm:ProgramOnTheWeb,FIFE}"; Filename: "http://www.fifengine.net/"
@@ -64,7 +64,7 @@ Name: "{group}\demos\Pychan demo"; Filename: "python.exe"; Parameters: """{app}\
 Name: "{group}\{cm:UninstallProgram,FIFE}"; Filename: "{uninstallexe}"
 
 [Run]
-Filename: "{app}\engine\fife-0.3.4rc1.win32.exe";
+Filename: "{app}\engine\fife-0.3.5.win32.exe";
 
 
 
diff --git a/demos/rio_de_hola/gui/rootpanel.xml b/demos/rio_de_hola/gui/rootpanel.xml
index 99244b6ed..d1fd3ae32 100644
--- a/demos/rio_de_hola/gui/rootpanel.xml
+++ b/demos/rio_de_hola/gui/rootpanel.xml
@@ -1,5 +1,5 @@
 <HBox opaque='1'>
-	<Label name="Title" text="Rio de hola - FIFE 0.3.4"/>
+	<Label name="Title" text="Rio de hola - FIFE 0.3.5"/>
 	<Button name="quitButton" text="Quit"/>
 	<Button name="aboutButton" text="About"/>
 	<Button name="optionsButton" text="Options"/>
diff --git a/engine/core/model/structures/instance.cpp b/engine/core/model/structures/instance.cpp
index a69e9d120..967d0f1c7 100644
--- a/engine/core/model/structures/instance.cpp
+++ b/engine/core/model/structures/instance.cpp
@@ -459,12 +459,12 @@ namespace FIFE {
 		initializeAction(actionName);
 		m_activity->m_actionInfo->m_target = new Location(target);
 		m_activity->m_actionInfo->m_speed = speed;
-		setFacingLocation(target);
 		FL_DBG(_log, LMsg("starting action ") <<  actionName << " from" << m_location << " to " << target << " with speed " << speed);
 
 		Route* route = m_activity->m_actionInfo->m_route;
 		if (!route) {
 			route = new Route(m_location, *m_activity->m_actionInfo->m_target);
+			route->setRotation(getRotation());
 			if (costId != "") {
 				route->setCostId(costId);
 			}
@@ -477,6 +477,7 @@ namespace FIFE {
 			}
 			m_activity->m_actionInfo->m_route = route;
 			if (!m_activity->m_actionInfo->m_pather->solveRoute(route)) {
+				setFacingLocation(target);
 				finalizeAction();
 			}
 		}
@@ -488,31 +489,15 @@ namespace FIFE {
 		m_activity->m_actionInfo->m_speed = speed;
 		m_activity->m_actionInfo->m_leader = leader;
 		leader->addDeleteListener(this);
-		setFacingLocation(*m_activity->m_actionInfo->m_target);
 		FL_DBG(_log, LMsg("starting action ") <<  actionName << " from" << m_location << " to " << *m_activity->m_actionInfo->m_target << " with speed " << speed);
 	}
 
 	void Instance::follow(const std::string& actionName, Route* route, const double speed) {
-		// if new follow is identical with the old then return
-		if (m_activity) {
-			if (m_activity->m_actionInfo) {
-				if (m_activity->m_actionInfo->m_target) {
-					if (m_activity->m_actionInfo->m_target->getLayerCoordinates() == route->getEndNode().getLayerCoordinates() &&
-						Mathd::Equal(speed, m_activity->m_actionInfo->m_speed) &&
-						m_activity->m_actionInfo->m_action == m_object->getAction(actionName) &&
-						route->getCostId() == m_activity->m_actionInfo->m_route->getCostId()) {
-
-						return;
-					}
-				}
-			}
-		}
 		initializeAction(actionName);
 		m_activity->m_actionInfo->m_target = new Location(route->getEndNode());
 		m_activity->m_actionInfo->m_speed = speed;
 		m_activity->m_actionInfo->m_route = route;
 		m_activity->m_actionInfo->m_delete_route = false;
-		setFacingLocation(*m_activity->m_actionInfo->m_target);
 		if (isMultiCell()) {
 			route->setObject(m_object);
 			route->setOccupiedArea(m_location.getLayer()->getCellGrid()->
@@ -631,6 +616,7 @@ namespace FIFE {
 		}
 		if (!route) {
 			route = new Route(m_location, *info->m_target);
+			route->setRotation(getRotation());
 			info->m_route = route;
 			if (isMultiCell()) {
 				route->setObject(m_object);
@@ -640,6 +626,7 @@ namespace FIFE {
 				route->setObject(m_object);
 			}
 			if (!info->m_pather->solveRoute(route)) {
+				setFacingLocation(target);
 				return true;
 			}
 		// update target if needed
@@ -652,9 +639,14 @@ namespace FIFE {
 						toMultiCoordinates(m_location.getLayerCoordinates(), m_object->getMultiObjectCoordinates(m_rotation)));
 				}
 			} else {
-				route->setStartNode(m_location);
+				if (route->getPathLength() == 0) {
+					route->setStartNode(m_location);
+				} else {
+					route->setStartNode(route->getCurrentNode());
+				}
 				route->setEndNode(target);
 				if (!info->m_pather->solveRoute(route)) {
+					setFacingLocation(target);
 					return true;
 				}
 			}
@@ -707,12 +699,17 @@ namespace FIFE {
 			// need new route?
 			if (route->getEndNode().getLayerCoordinates() != m_location.getLayerCoordinates()) {
 				if (m_location.getLayerDistanceTo(target) > 1.5) {
-					route->setStartNode(m_location);
+					if (route->getPathLength() == 0) {
+						route->setStartNode(m_location);
+					} else {
+						route->setStartNode(route->getPreviousNode());
+					}
 					route->setEndNode(target);
 					route->setOccupiedArea(m_location.getLayer()->getCellGrid()->
 						toMultiCoordinates(m_location.getLayerCoordinates(), m_object->getMultiObjectCoordinates(m_rotation)));
 					return !info->m_pather->solveRoute(route);
 				}
+				setFacingLocation(target);
 			}
 			return true;
 		} else if (route->getRouteStatus() == ROUTE_FAILED) {
diff --git a/engine/core/pathfinder/route.cpp b/engine/core/pathfinder/route.cpp
index ecbbea768..1d85136ff 100644
--- a/engine/core/pathfinder/route.cpp
+++ b/engine/core/pathfinder/route.cpp
@@ -163,8 +163,8 @@ namespace FIFE {
 		if (!m_path.empty()) {
 			m_status = ROUTE_SOLVED;
 			m_current = m_path.begin();
-			m_startNode = path.front();
-			m_endNode = path.back();
+			m_startNode = m_path.front();
+			m_endNode = m_path.back();
 		}
 		if (!isMultiCell()) {
 			m_replanned = false;
diff --git a/engine/core/pathfinder/routepather/routepather.cpp b/engine/core/pathfinder/routepather/routepather.cpp
index b06ca3ba3..f17c1ec6a 100644
--- a/engine/core/pathfinder/routepather/routepather.cpp
+++ b/engine/core/pathfinder/routepather/routepather.cpp
@@ -280,32 +280,42 @@ namespace FIFE {
 		Location currentNode = route->getCurrentNode();
 		bool multiCell = route->isMultiCell();
 		if (!locationsEqual(current, currentNode)) {
-			route->setRotation(getAngleBetween(current, currentNode));
 			// special blocker check for multicell
 			if (multiCell) {
+				int32_t oldRotation = route->getRotation();
+				// old coordinates
+				std::vector<ModelCoordinate> oldCoords = current.getLayer()->getCellGrid()->
+					toMultiCoordinates(current.getLayerCoordinates(), route->getOccupiedCells(route->getRotation()));
+				oldCoords.push_back(current.getLayerCoordinates());
+				route->setRotation(getAngleBetween(current, currentNode));
+				// new coordinates
 				std::vector<ModelCoordinate> newCoords = currentNode.getLayer()->getCellGrid()->
 					toMultiCoordinates(currentNode.getLayerCoordinates(), route->getOccupiedCells(route->getRotation()));
 				newCoords.push_back(currentNode.getLayerCoordinates());
-				const std::set<Object*>& parts = route->getObject()->getMultiParts();
+
 				std::vector<ModelCoordinate>::const_iterator nco_it = newCoords.begin();
 				for (; nco_it != newCoords.end(); ++nco_it) {
 					if (currentNode.getLayer()->cellContainsBlockingInstance(*nco_it)) {
-						std::vector<Instance*> blocker = currentNode.getLayer()->getBlockingInstances(*nco_it);
-						std::vector<Instance*>::iterator block_it = blocker.begin();
-						for (; block_it != blocker.end(); ++block_it) {
-							std::set<Object*>::const_iterator obj_it = std::find(parts.begin(), parts.end(), (*block_it)->getObject());
-							if (obj_it != parts.end() || route->getObject() == (*block_it)->getObject()) {
-								continue;
+						bool found = false;
+						std::vector<ModelCoordinate>::const_iterator oco_it = oldCoords.begin();
+						for (; oco_it != oldCoords.end(); ++oco_it) {
+							if (*oco_it == *nco_it) {
+								found = true;
+								break;
 							}
-							nextBlocker = true;
-							break;
 						}
-						if (nextBlocker) {
-							break;
+						// if we have a blocker that is not part of the object
+						if (!found) {
+							nextBlocker = true;
 						}
 					}
+					if (nextBlocker) {
+						route->setRotation(oldRotation);
+						break;
+					}
 				}
 			} else {
+				route->setRotation(getAngleBetween(current, currentNode));
 				if (currentNode.getLayer()->cellContainsBlockingInstance(currentNode.getLayerCoordinates())) {
 					nextBlocker = true;
 				}
diff --git a/engine/core/version.h b/engine/core/version.h
index 3b6224932..031af6a39 100644
--- a/engine/core/version.h
+++ b/engine/core/version.h
@@ -26,7 +26,7 @@
 // as part of the release process for FIFE.
 #define FIFE_MAJOR_VERSION 0
 #define FIFE_MINOR_VERSION 3
-#define FIFE_SUBMINOR_VERSION 4
+#define FIFE_SUBMINOR_VERSION 5
 
 // -------------------------------------------------------------------------
 //  Do not update anything below this line!
@@ -69,7 +69,9 @@ namespace FIFE {
 #ifdef FIFE_REVISION
 		return FIFE_REVISION;
 #else
-		return 4103;
+		//This is useless since moving to git so we return a bogus number.
+		//The next release will not include this at all.
+		return 9999;
 #endif
 	}
 } //FIFE
diff --git a/engine/core/view/layercache.cpp b/engine/core/view/layercache.cpp
index 0639be261..16a44e0bd 100644
--- a/engine/core/view/layercache.cpp
+++ b/engine/core/view/layercache.cpp
@@ -467,30 +467,30 @@ namespace FIFE {
 			if ((entry->updateInfo & EntryVisualUpdate) == EntryVisualUpdate) {
 				positionUpdate |= updateVisual(entry);
 			}
-
+			bool onScreenA = entry->visible && item->image && item->dimensions.intersects(viewport);
 			if (positionUpdate) {
-				bool onScreenA = item->dimensions.intersects(viewport);
 				updatePosition(entry);
-				bool onScreenB = item->dimensions.intersects(viewport);
-				if (onScreenA != onScreenB) {
-					if (!onScreenA && entry->visible && item->image) {
-						// add to renderlist and sort
-						renderlist.push_back(item);
-						needSorting.push_back(item);
-					} else {
-						// remove from renderlist
-						for (RenderList::iterator it = renderlist.begin(); it != renderlist.end(); ++it) {
-							if ((*it)->instance == item->instance) {
-								renderlist.erase(it);
-								break;
-							}
+			}
+			bool onScreenB = entry->visible && item->image && item->dimensions.intersects(viewport);
+			if (onScreenA != onScreenB) {
+				if (!onScreenA) {
+					// add to renderlist and sort
+					renderlist.push_back(item);
+					needSorting.push_back(item);
+				} else {
+					// remove from renderlist
+					for (RenderList::iterator it = renderlist.begin(); it != renderlist.end(); ++it) {
+						if ((*it)->instance == item->instance) {
+							renderlist.erase(it);
+							break;
 						}
 					}
-				} else if (onScreenA && onScreenB) {
-					// sort
-					needSorting.push_back(item);
 				}
+			} else if (onScreenA && onScreenB && positionUpdate) {
+				// sort
+				needSorting.push_back(item);
 			}
+
 			if (!entry->forceUpdate || !entry->visible) {
 				entry->forceUpdate = false;
 				entry->updateInfo = EntryNoneUpdate;
diff --git a/setup.py b/setup.py
index 4b26dcba5..a99813321 100644
--- a/setup.py
+++ b/setup.py
@@ -33,7 +33,7 @@
 
 
 setup(name='fife',
-      version='0.3.4rc1',
+      version='0.3.5',
       description='Flexible Isometric Free Engine',
       url='www.fifengine.net',
       packages = ['fife', 'fife.extensions', 'fife.extensions.pychan', 'fife.extensions.pychan.widgets', 'fife.extensions.pychan.widgets.ext', 'fife.extensions.serializers' ],