diff --git a/build-appveyor.bat b/build-appveyor.bat
index aae9082..0b9bbf4 100644
--- a/build-appveyor.bat
+++ b/build-appveyor.bat
@@ -6,6 +6,7 @@ ECHO ~~~~~~~~~~~~~~~~~~~ %~f0 ~~~~~~~~~~~~~~~~~~~
 SET ROOTDIR=%CD%
 SET PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH%
 SET PATH=%CD%\scriptcs;%PATH%
+SET PATH=%CD%\docfx;%PATH%
 
 FOR /F "tokens=*" %%i in ('powershell Get-ExecutionPolicy') do SET PSPOLICY=%%i
 ECHO Powershell execution policy^: %PSPOLICY%
diff --git a/scripts/build-docs.sh b/scripts/build-docs.sh
new file mode 100644
index 0000000..4642d99
--- /dev/null
+++ b/scripts/build-docs.sh
@@ -0,0 +1,12 @@
+set -eu
+
+echo docfx needs mono-devel to run
+
+if [ ! -f "docfx.zip" ]; then curl -o docfx.zip -L https://github.com/dotnet/docfx/releases/download/v2.15.1/docfx.zip; fi
+if [ ! -d "docfx" ]; then mkdir -p docfx && unzip -o docfx.zip -d docfx; fi
+
+#Generating docs in one step ('docfx.exe docfx.json') fails with:
+#System.Reflection.ReflectionTypeLoadException
+#splitting in two steps works
+mono ./docfx/docfx.exe metadata ./src/Documentation/docfx.json
+mono ./docfx/docfx.exe build ./src/Documentatio/docfx.json
diff --git a/scripts/build.csx b/scripts/build.csx
index d3b0c53..1b9ed9b 100644
--- a/scripts/build.csx
+++ b/scripts/build.csx
@@ -8,9 +8,9 @@ using System.Text;
 using System.Text.RegularExpressions;
 
 string access_token = Environment.GetEnvironmentVariable("MAPBOX_ACCESS_TOKEN");
-if(string.IsNullOrWhiteSpace(access_token)){
-    Console.Error.WriteLine("%MAPBOX_ACCESS_TOKEN% not set - cannot run tests");
-    Environment.Exit(1);
+if (string.IsNullOrWhiteSpace(access_token)) {
+	Console.Error.WriteLine("%MAPBOX_ACCESS_TOKEN% not set - cannot run tests");
+	Environment.Exit(1);
 }
 
 //ATTENTION: latest version of `srciptcs` seems to change the current directory
@@ -20,6 +20,8 @@ Console.WriteLine("cwd [build.csx]: {0}", Directory.GetCurrentDirectory());
 Directory.SetCurrentDirectory(rootDir);
 Console.WriteLine("cwd [build.csx]: {0}", Directory.GetCurrentDirectory());
 string commitMessage = Environment.GetEnvironmentVariable("APPVEYOR_REPO_COMMIT_MESSAGE");
+string commitMessageEx = Environment.GetEnvironmentVariable("APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED");
+if (!string.IsNullOrWhiteSpace(commitMessageEx)) { commitMessage += " " + commitMessageEx; }
 Console.WriteLine("commit message: \"{0}\"", commitMessage);
 
 string configuration = Environment.GetEnvironmentVariable("configuration");
@@ -35,35 +37,30 @@ if (publishNuget) { Console.WriteLine("going to publish to nuget.org"); }
 if (publishDocs) { Console.WriteLine("going to publish docs"); }
 
 string nugetApiKey;
-if (publishNuget)
-{
-    nugetApiKey = Environment.GetEnvironmentVariable("NUGET_API_KEY");
-    if (string.IsNullOrWhiteSpace(nugetApiKey))
-    {
-        Console.Error.WriteLine("cannot publish to nuget.org without %NUGET_API_KEY%");
-        Environment.Exit(1);
-    }
+if (publishNuget) {
+	nugetApiKey = Environment.GetEnvironmentVariable("NUGET_API_KEY");
+	if (string.IsNullOrWhiteSpace(nugetApiKey)) {
+		Console.Error.WriteLine("cannot publish to nuget.org without %NUGET_API_KEY%");
+		Environment.Exit(1);
+	}
 }
 
 string githubToken;
-if (publishDocs)
-{
-    githubToken = Environment.GetEnvironmentVariable("GITHUB_TOKEN");
-    if (string.IsNullOrWhiteSpace(githubToken))
-    {
-        Console.Error.WriteLine("cannot publish docs without %GITHUB_TOKEN%");
-        Environment.Exit(1);
-    }
+if (publishDocs) {
+	githubToken = Environment.GetEnvironmentVariable("GITHUB_TOKEN");
+	if (string.IsNullOrWhiteSpace(githubToken)) {
+		Console.Error.WriteLine("cannot publish docs without %GITHUB_TOKEN%");
+		Environment.Exit(1);
+	}
 }
 
 string versionDLL;
 string versionNupkg;
 
 
-using (TextReader tr = new StreamReader("versions.txt"))
-{
-    versionDLL = tr.ReadLine().Split(":".ToCharArray())[1].Trim();
-    versionNupkg = tr.ReadLine().Split(":".ToCharArray())[1].Trim();
+using (TextReader tr = new StreamReader("versions.txt")) {
+	versionDLL = tr.ReadLine().Split(":".ToCharArray())[1].Trim();
+	versionNupkg = tr.ReadLine().Split(":".ToCharArray())[1].Trim();
 }
 
 Console.WriteLine("configuration: {0}", configuration);
@@ -74,15 +71,14 @@ Console.WriteLine("  - nupkg : {0}", versionNupkg);
 
 //////// PATCH SharedAssemblyInfo.cs
 string sharedAssemblyInfo = Path.Combine(
-    rootDir
-    , "src"
-    , "SharedAssemblyInfo.cs"
+	rootDir
+	, "src"
+	, "SharedAssemblyInfo.cs"
 );
 Console.WriteLine("Patching [{0}] to version [{1}]", sharedAssemblyInfo, versionDLL);
 string assemblyInfo;
-using (TextReader tr = new StreamReader(sharedAssemblyInfo, Encoding.UTF8))
-{
-    assemblyInfo = tr.ReadToEnd();
+using (TextReader tr = new StreamReader(sharedAssemblyInfo, new UTF8Encoding(false))) {
+	assemblyInfo = tr.ReadToEnd();
 }
 Console.WriteLine("old assemblyInfo:" + Environment.NewLine + assemblyInfo);
 Regex regex = new Regex("AssemblyVersion\\(\"([^)]*)");
@@ -91,25 +87,24 @@ regex = new Regex("AssemblyFileVersion\\(\"([^)]*)");
 assemblyInfo = regex.Replace(assemblyInfo, string.Format("AssemblyFileVersion(\"{0}\"", versionDLL));
 Console.WriteLine("new assemblyInfo:" + Environment.NewLine + assemblyInfo);
 
-using (TextWriter tw = new StreamWriter(sharedAssemblyInfo, false, Encoding.UTF8))
-{
-    tw.Write(assemblyInfo);
+using (TextWriter tw = new StreamWriter(sharedAssemblyInfo, false, Encoding.UTF8)) {
+	tw.Write(assemblyInfo);
 }
 //////// PATCH SharedAssemblyInfo.cs
 
 
 string buildCmd = string.Format(
-    "msbuild MapboxSdkCs.sln /p:Configuration={0}",
-    configuration
+	"msbuild MapboxSdkCs.sln /p:Configuration={0}",
+	configuration
 );
 Console.WriteLine("building [{0}]", buildCmd);
-if (!RunCommand(buildCmd, true))
-{
-    Console.Error.WriteLine("build failed");
-    Environment.Exit(1);
+if (!RunCommand(buildCmd, true)) {
+	Console.Error.WriteLine("build failed");
+	Environment.Exit(1);
 }
 
 
+//---------- nupkg
 string nugetCmd = string.Format("nuget pack -properties version={0}", versionNupkg);
 Console.WriteLine("creating nupkg: [{0}]", nugetCmd);
 Console.WriteLine("Skipping nuget pack! TODO: Build 'DebugNet' and 'DebugUWP' on one configuration!");
@@ -119,73 +114,75 @@ Console.WriteLine("Skipping nuget pack! TODO: Build 'DebugNet' and 'DebugUWP' on
 //     Environment.Exit(1);
 // }
 
+if (!publishNuget) {
+	Console.WriteLine("NOT publishing to nuget.org");
+} else {
+	Console.WriteLine("publishing to nuget.org");
+	string nugetCmd = string.Format("nuget push MapboxSdkCs.{0}.nupkg {1} -Source https://www.nuget.org/api/v2/package", versionNupkg, nugetApiKey);
+	if (!RunCommand(nugetCmd)) {
+		Console.Error.WriteLine("publishing to nuget.org failed");
+		Environment.Exit(1);
+	}
+}
 
 
-
-if (!publishNuget)
-{
-    Console.WriteLine("NOT publishing to nuget.org");
+//---------- documentation
+Console.WriteLine("downloading docfx ...");
+if (!RunCommand("powershell Invoke-WebRequest https://github.com/dotnet/docfx/releases/download/v2.14.1/docfx.zip -OutFile docfx.zip", true)) {
+	Console.Error.WriteLine("could not download docfx");
+	Environment.Exit(1);
 }
-else
-{
-    Console.WriteLine("publishing to nuget.org");
-    string nugetCmd = string.Format("nuget push MapboxSdkCs.{0}.nupkg {1} -Source https://www.nuget.org/api/v2/package", versionNupkg, nugetApiKey);
-    if (!RunCommand(nugetCmd))
-    {
-        Console.Error.WriteLine("publishing to nuget.org failed");
-        Environment.Exit(1);
-    }
+
+Console.WriteLine("extracting docfx ...");
+if (!RunCommand("7z x docfx.zip -aoa -o%CD%\\docfx | %windir%\\system32\\find \"ing archive\"", true)) {
+	Console.Error.WriteLine("could not extract docfx");
+	Environment.Exit(1);
 }
 
+Console.WriteLine("building docs ....");
 
-if (!publishDocs)
-{
-    Console.WriteLine("NOT publishing docs");
+if (!RunCommand(@"docfx src\Documentation\docfx.json", true)) {
+	Console.Error.WriteLine("generating docs failed");
+	Environment.Exit(1);
 }
-else
-{
-    Console.WriteLine("publishing dcos");
-    try
-    {
-        string originalCommit = Environment.GetEnvironmentVariable("APPVEYOR_REPO_COMMIT");
-        if (string.IsNullOrWhiteSpace(originalCommit))
-        {
-            originalCommit = "no SHA available";
-        }
-        else
-        {
-            originalCommit = "https://github.com/mapbox/mapbox-sdk-cs/commit/" + originalCommit;
-        }
-
-        string commitAuthor = Environment.GetEnvironmentVariable("APPVEYOR_REPO_COMMIT_AUTHOR");
-        if (string.IsNullOrWhiteSpace(commitAuthor))
-        {
-            commitAuthor = "no commit author available";
-        }
-
-        string docsDir = Path.Combine(rootDir, "src", "Documentation", "_site");
-        Console.WriteLine("docs directory: {0}", docsDir);
-        Environment.CurrentDirectory = docsDir;
-        List<string> cmds = new List<string>(new string[]{
+Console.WriteLine("docs successfully generated");
+
+if (!publishDocs) {
+	Console.WriteLine("NOT publishing docs");
+} else {
+	Console.WriteLine("publishing dcos");
+	try {
+		string originalCommit = Environment.GetEnvironmentVariable("APPVEYOR_REPO_COMMIT");
+		if (string.IsNullOrWhiteSpace(originalCommit)) {
+			originalCommit = "no SHA available";
+		} else {
+			originalCommit = "https://github.com/mapbox/mapbox-sdk-cs/commit/" + originalCommit;
+		}
+
+		string commitAuthor = Environment.GetEnvironmentVariable("APPVEYOR_REPO_COMMIT_AUTHOR");
+		if (string.IsNullOrWhiteSpace(commitAuthor)) {
+			commitAuthor = "no commit author available";
+		}
+
+		string docsDir = Path.Combine(rootDir, "src", "Documentation", "_site");
+		Console.WriteLine("docs directory: {0}", docsDir);
+		Environment.CurrentDirectory = docsDir;
+		List<string> cmds = new List<string>(new string[]{
             //"dir",
             "git init .",
-            "git add .",
-            string.Format("git commit -m \"pushed via [{0}] by [{1}]\"", originalCommit,commitAuthor),
-            string.Format("git remote add origin https://{0}@github.com/mapbox/mapbox-sdk-cs.git", githubToken),
-            "git checkout -b gh-pages",
-            "git push -f origin gh-pages"
-        });
-        foreach (var cmd in cmds)
-        {
-            if (!RunCommand(cmd))
-            {
-                Console.Error.WriteLine("publishing docs failed");
-                Environment.Exit(1);
-            }
-        }
-    }
-    finally
-    {
-        Environment.CurrentDirectory = rootDir;
-    }
+			"git add .",
+			string.Format("git commit -m \"pushed via [{0}] by [{1}]\"", originalCommit,commitAuthor),
+			string.Format("git remote add origin https://{0}@github.com/mapbox/mapbox-sdk-cs.git", githubToken),
+			"git checkout -b gh-pages",
+			"git push -f origin gh-pages"
+		});
+		foreach (var cmd in cmds) {
+			if (!RunCommand(cmd)) {
+				Console.Error.WriteLine("publishing docs failed");
+				Environment.Exit(1);
+			}
+		}
+	} finally {
+		Environment.CurrentDirectory = rootDir;
+	}
 }
diff --git a/scripts/omnisharp.json b/scripts/omnisharp.json
new file mode 100644
index 0000000..d048b15
--- /dev/null
+++ b/scripts/omnisharp.json
@@ -0,0 +1,54 @@
+{
+    "FormattingOptions": {
+            //"NewLine": "\n",
+            "UseTabs": true,
+            "TabSize": 4,
+            "IndentationSize": 4,
+            "SpacingAfterMethodDeclarationName": false,
+            "SpaceWithinMethodDeclarationParenthesis": false,
+            "SpaceBetweenEmptyMethodDeclarationParentheses": false,
+            "SpaceAfterMethodCallName": false,
+            "SpaceWithinMethodCallParentheses": false,
+            "SpaceBetweenEmptyMethodCallParentheses": false,
+            "SpaceAfterControlFlowStatementKeyword": true,
+            "SpaceWithinExpressionParentheses": false,
+            "SpaceWithinCastParentheses": false,
+            "SpaceWithinOtherParentheses": false,
+            "SpaceAfterCast": false,
+            "SpacesIgnoreAroundVariableDeclaration": false,
+            "SpaceBeforeOpenSquareBracket": false,
+            "SpaceBetweenEmptySquareBrackets": false,
+            "SpaceWithinSquareBrackets": false,
+            "SpaceAfterColonInBaseTypeDeclaration": true,
+            "SpaceAfterComma": true,
+            "SpaceAfterDot": false,
+            "SpaceAfterSemicolonsInForStatement": true,
+            "SpaceBeforeColonInBaseTypeDeclaration": true,
+            "SpaceBeforeComma": false,
+            "SpaceBeforeDot": false,
+            "SpaceBeforeSemicolonsInForStatement": false,
+            "SpacingAroundBinaryOperator": "single",
+            "IndentBraces": false,
+            "IndentBlock": true,
+            "IndentSwitchSection": true,
+            "IndentSwitchCaseSection": true,
+            "LabelPositioning": "oneLess",
+            "WrappingPreserveSingleLine": true,
+            "WrappingKeepStatementsOnSingleLine": true,
+            "NewLinesForBracesInTypes": false,
+            "NewLinesForBracesInMethods": false,
+            "NewLinesForBracesInProperties": false,
+            "NewLinesForBracesInAccessors": false,
+            "NewLinesForBracesInAnonymousMethods": false,
+            "NewLinesForBracesInControlBlocks": false,
+            "NewLinesForBracesInAnonymousTypes": false,
+            "NewLinesForBracesInObjectCollectionArrayInitializers": false,
+            "NewLinesForBracesInLambdaExpressionBody": false,
+            "NewLineForElse": false,
+            "NewLineForCatch": false,
+            "NewLineForFinally": false,
+            "NewLineForMembersInObjectInit": false,
+            "NewLineForMembersInAnonymousTypes": false,
+            "NewLineForClausesInQuery": false
+    }
+}
\ No newline at end of file
diff --git a/src/Documentation/Documentation.csproj b/src/Documentation/Documentation.csproj
index 4188227..63a0c1f 100644
--- a/src/Documentation/Documentation.csproj
+++ b/src/Documentation/Documentation.csproj
@@ -53,20 +53,15 @@
     <None Include="articles\intro.md" />
     <None Include="articles\toc.md" />
     <None Include="articles\toc.yml" />
-    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\..\packages\docfx.msbuild.2.4.0\build\docfx.msbuild.targets" Condition="Exists('..\..\packages\docfx.msbuild.2.4.0\build\docfx.msbuild.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\docfx.msbuild.2.4.0\build\docfx.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\docfx.msbuild.2.4.0\build\docfx.msbuild.targets'))" />
-  </Target>
   <PropertyGroup>
     <PreBuildEvent Condition="'$(OS)'=='Windows_NT'">copy /Y "$(ProjectDir)docfx.msbuild.targets" "$(SolutionDir)packages/docfx.msbuild.2.4.0/build/"</PreBuildEvent>
     <PreBuildEvent Condition="'$(OS)'!='Windows_NT'">cp -f "$(ProjectDir)docfx.msbuild.targets" "$(SolutionDir)packages/docfx.msbuild.2.4.0/build/"</PreBuildEvent>
   </PropertyGroup>
+  <PropertyGroup>
+    <PreBuildEvent />
+  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/Documentation/packages.config b/src/Documentation/packages.config
deleted file mode 100644
index 9c7aabe..0000000
--- a/src/Documentation/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="docfx.msbuild" version="2.4.0" targetFramework="net35" />
-</packages>
\ No newline at end of file
diff --git a/src/Map/CanonicalTileId.cs b/src/Map/CanonicalTileId.cs
index 6b1b2a5..04a0f4a 100644
--- a/src/Map/CanonicalTileId.cs
+++ b/src/Map/CanonicalTileId.cs
@@ -6,13 +6,14 @@
 
 namespace Mapbox.Map
 {
-    using System;
-    using Mapbox.Utils;
+	using System;
+	using Mapbox.Utils;
 
-    /// <summary>
-    ///     Canonical tile identifier in a slippy map.
-    /// </summary>
-    public struct CanonicalTileId
+	/// <summary>
+	/// Data type to store  <see href="https://en.wikipedia.org/wiki/Web_Mercator"> Web Mercator</see> tile scheme.
+	/// <see href="http://www.maptiler.org/google-maps-coordinates-tile-bounds-projection/"> See tile IDs in action. </see>
+	/// </summary>
+	public struct CanonicalTileId
 	{
 		/// <summary> The zoom level. </summary>
 		public readonly int Z;
diff --git a/src/Map/ClassicRasterTile.cs b/src/Map/ClassicRasterTile.cs
index dbd9ec1..0dfbcfd 100644
--- a/src/Map/ClassicRasterTile.cs
+++ b/src/Map/ClassicRasterTile.cs
@@ -9,6 +9,7 @@ namespace Mapbox.Map
 	/// <summary>
 	///    A raster tile from the Mapbox Map API, a encoded image representing a geographic
 	///    bounding box. Usually JPEG or PNG encoded.
+	/// See <see cref="T:Mapbox.Map.RasterTile"/> for usage.
 	/// </summary>
 	public class ClassicRasterTile : RasterTile
 	{
diff --git a/src/Map/Map.cs b/src/Map/Map.cs
index f74d5fd..5cba3be 100644
--- a/src/Map/Map.cs
+++ b/src/Map/Map.cs
@@ -6,20 +6,35 @@
 
 namespace Mapbox.Map
 {
-    using System;
-    using System.Collections.Generic;
-    using Mapbox.Platform;
-    using Mapbox.Utils;
-
-    /// <summary>
-    ///     The Mapbox Map abstraction will take care of fetching and decoding
-    ///     data for a geographic bounding box at a certain zoom level.
-    /// </summary>
-    /// <typeparam name="T">
-    ///     The tile type, currently <see cref="T:Mapbox.Map.Vector"/> or
-    ///     <see cref="T:Mapbox.Map.Raster"/>.
-    /// </typeparam>
-    public sealed class Map<T> : Mapbox.Utils.IObservable<T> where T : Tile, new()
+	using System;
+	using System.Collections.Generic;
+	using Mapbox.Platform;
+	using Mapbox.Utils;
+
+	/// <summary>
+	///     The Mapbox Map abstraction will take care of fetching and decoding
+	///     data for a geographic bounding box at a certain zoom level.
+	/// </summary>
+	/// <typeparam name="T">
+	///     The tile type, currently <see cref="T:Mapbox.Map.Vector"/> or
+	///     <see cref="T:Mapbox.Map.Raster"/>.
+	/// </typeparam>
+	/// <example>
+	/// Request a map of the whole world:
+	/// <code>
+	/// var map = new Map&lt;RasterTile&gt;(MapboxAccess.Instance);
+	/// map.Zoom = 2
+	/// map.Vector2dBounds = Vector2dBounds.World();
+	/// map.MapId = "mapbox://styles/mapbox/streets-v10
+	/// 
+	/// // Register for tile updates.
+	/// map.Subscribe(this);
+	/// 
+	/// // Trigger the request.
+	/// map.Update();
+	/// </code>
+	/// </example>
+	public sealed class Map<T> : Mapbox.Utils.IObservable<T> where T : Tile, new()
 	{
 		/// <summary>
 		///     Arbitrary limit of tiles this class will handle simultaneously.
@@ -55,12 +70,15 @@ public Map(IFileSource fs)
 		///     <see cref="T:Mapbox.Map.RasterTile"/> will take the full style URL
 		///     from where the tile is composited from, like "mapbox://styles/mapbox/streets-v9".
 		/// </value>
-		public string MapId {
-			get {
+		public string MapId
+		{
+			get
+			{
 				return this.mapId;
 			}
 
-			set {
+			set
+			{
 				if (this.mapId == value)
 				{
 					return;
@@ -74,7 +92,6 @@ public string MapId {
 				}
 
 				this.tiles.Clear();
-				this.Update();
 			}
 		}
 
@@ -83,54 +100,61 @@ public string MapId {
 		///     in a incomplete state.
 		/// </summary>
 		/// <value> The tiles. </value>
-		public HashSet<T> Tiles {
-			get {
+		public HashSet<T> Tiles
+		{
+			get
+			{
 				return this.tiles;
 			}
 		}
 
 		/// <summary>Gets or sets a geographic bounding box.</summary>
 		/// <value>New geographic bounding box.</value>
-		public Vector2dBounds Vector2dBounds {
-			get {
+		public Vector2dBounds Vector2dBounds
+		{
+			get
+			{
 				return this.latLngBounds;
 			}
 
-			set {
+			set
+			{
 				this.latLngBounds = value;
-				this.Update();
 			}
 		}
 
 		/// <summary>Gets or sets the central coordinate of the map.</summary>
 		/// <value>The central coordinate.</value>
-		public Vector2d Center {
-			get {
+		public Vector2d Center
+		{
+			get
+			{
 				return this.latLngBounds.Center;
 			}
 
-			set {
+			set
+			{
 				this.latLngBounds.Center = value;
-				this.Update();
 			}
 		}
 
 		/// <summary>Gets or sets the map zoom level.</summary>
 		/// <value>The new zoom level.</value>
-		public int Zoom {
-			get {
+		public int Zoom
+		{
+			get
+			{
 				return this.zoom;
 			}
 
-			set {
+			set
+			{
 				this.zoom = Math.Max(0, Math.Min(20, value));
-				this.Update();
 			}
 		}
 
 		/// <summary>
-		///     Sets the coordinates bounds and zoom at once. More efficient than
-		///     doing it in two steps because it only causes one map update.
+		///     Sets the coordinates bounds and zoom at once.
 		/// </summary>
 		/// <param name="bounds"> Coordinates bounds. </param>
 		/// <param name="zoom"> Zoom level. </param>
@@ -138,7 +162,6 @@ public void SetVector2dBoundsZoom(Vector2dBounds bounds, int zoom)
 		{
 			this.latLngBounds = bounds;
 			this.zoom = zoom;
-			this.Update();
 		}
 
 		/// <summary> Add an <see cref="T:IObserver" /> to the observer list. </summary>
@@ -165,7 +188,10 @@ private void NotifyNext(T next)
 			}
 		}
 
-		private void Update()
+		/// <summary>
+		/// Request tiles after changing map properties.
+		/// </summary>
+		public void Update()
 		{
 			var cover = TileCover.Get(this.latLngBounds, this.zoom);
 
diff --git a/src/Map/RasterTile.cs b/src/Map/RasterTile.cs
index a3eae8c..5989fc1 100644
--- a/src/Map/RasterTile.cs
+++ b/src/Map/RasterTile.cs
@@ -4,40 +4,66 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-using System;
-
-namespace Mapbox.Map {
-
-
+namespace Mapbox.Map
+{
 	/// <summary>
-	///    A raster tile from the Mapbox Style API, a encoded image representing a geographic
-	///    bounding box. Usually JPEG or PNG encoded.
+	/// A raster tile from the Mapbox Style API, an encoded image representing a geographic
+	/// bounding box. Usually JPEG or PNG encoded.
 	/// </summary>
-	public class RasterTile : Tile {
-
+	/// <example>
+	/// Making a RasterTile request:
+	/// <code>
+	/// var parameters = new Tile.Parameters();
+	/// parameters.Fs = MapboxAccess.Instance;
+	/// parameters.Id = new CanonicalTileId(_zoom, _tileCoorindateX, _tileCoordinateY);
+	/// parameters.MapId = "mapbox://styles/mapbox/satellite-v9";
+	/// var rasterTile = new RasterTile();
+	/// 
+	/// // Make the request.
+	/// rasterTile.Initialize(parameters, (Action)(() =>
+	/// {
+	/// 	if (!string.IsNullOrEmpty(rasterTile.Error))
+	/// 	{
+	///			// Handle the error.
+	///		}
+	/// 
+	/// 	// Consume the <see cref="Data"/>.
+	///	}));
+	/// </code>
+	/// </example>
+	public class RasterTile : Tile
+	{
 		private byte[] data;
 
 		/// <summary> Gets the raster tile raw data. </summary>
 		/// <value> The raw data, usually an encoded JPEG or PNG. </value>
-		public byte[] Data {
-			get {
+		/// <example> 
+		/// Consuming data in Unity to create a Texture2D:
+		/// <code>
+		/// var texture = new Texture2D(0, 0);
+		/// texture.LoadImage(rasterTile.Data);
+		/// _sampleMaterial.mainTexture = texture;
+		/// </code>
+		/// </example>
+		public byte[] Data
+		{
+			get
+			{
 				return this.data;
 			}
 		}
 
-
-		internal override TileResource MakeTileResource(string styleUrl) {
+		internal override TileResource MakeTileResource(string styleUrl)
+		{
 			return TileResource.MakeRaster(Id, styleUrl);
 		}
 
-
-		internal override bool ParseTileData(byte[] data) {
+		internal override bool ParseTileData(byte[] data)
+		{
 			// We do not parse raster tiles as they are
 			this.data = data;
 
 			return true;
 		}
-
-
 	}
 }
diff --git a/src/Map/RawPngRasterTile.cs b/src/Map/RawPngRasterTile.cs
index 0984f14..02ac596 100644
--- a/src/Map/RawPngRasterTile.cs
+++ b/src/Map/RawPngRasterTile.cs
@@ -1,4 +1,4 @@
-//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
 // <copyright file="RawPngRasterTile.cs" company="Mapbox">
 //     Copyright (c) 2016 Mapbox. All rights reserved.
 // </copyright>
@@ -8,7 +8,24 @@ namespace Mapbox.Map
 {
 	/// <summary>
 	///    A raster tile containing an encoded RGBA PNG.
+	/// <see href="https://www.mapbox.com/blog/terrain-rgb/"> Read about global elevation data. </see>
 	/// </summary>
+	/// <example>
+	/// Print the real world height, in meters, for each pixel:
+	/// <code>
+	/// var texture = new Texture2D(0, 0);
+	/// texture.LoadImage(tile.Data);
+	/// for (int i = 0; i &lt; texture.width; i++)
+	/// {
+	///     for (int j = 0; j &lt; texture.height; j++)
+	///     {
+	///         var color = texture.GetPixel(i, j);
+	/// 		var height = Conversions.GetAbsoluteHeightFromColor(color);
+	/// 		Console.Write("Height: " + height);
+	///     }
+	/// }
+	/// </code>
+	/// </example>
 	public sealed class RawPngRasterTile : RasterTile
 	{
 		internal override TileResource MakeTileResource(string mapId)
diff --git a/src/Map/Tile.cs b/src/Map/Tile.cs
index 1249f13..d92ed0a 100644
--- a/src/Map/Tile.cs
+++ b/src/Map/Tile.cs
@@ -4,17 +4,18 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace Mapbox.Map 
+namespace Mapbox.Map
 {
-    using System;
-    using Mapbox.Platform;
+	using System;
+	using Mapbox.Platform;
 
-    /// <summary>
-    ///    A Map tile, a square with vector or raster data representing a geographic
-    ///    bounding box. More info <see href="https://en.wikipedia.org/wiki/Tiled_web_map">
-    ///    here </see>.
-    /// </summary>
-    public abstract class Tile {
+	/// <summary>
+	///    A Map tile, a square with vector or raster data representing a geographic
+	///    bounding box. More info <see href="https://en.wikipedia.org/wiki/Tiled_web_map">
+	///    here </see>.
+	/// </summary>
+	public abstract class Tile
+	{
 
 		private CanonicalTileId id;
 		private string error;
@@ -23,7 +24,8 @@ public abstract class Tile {
 		private Action callback;
 
 		/// <summary> Tile state. </summary>
-		public enum State {
+		public enum State
+		{
 			/// <summary> New tile, not yet initialized. </summary>
 			New,
 			/// <summary> Loading data. </summary>
@@ -34,21 +36,26 @@ public enum State {
 			Canceled
 		}
 
-		/// <summary> Gets the canonical tile identifier. </summary>
+		/// <summary> Gets the <see cref="T:Mapbox.Map.CanonicalTileId"/> identifier. </summary>
 		/// <value> The canonical tile identifier. </value>
-		public CanonicalTileId Id {
-			get {
+		public CanonicalTileId Id
+		{
+			get
+			{
 				return this.id;
 			}
-			set {
+			set
+			{
 				this.id = value;
 			}
 		}
 
 		/// <summary> Gets the error message if any. </summary>
 		/// <value> The error string. </value>
-		public string Error {
-			get {
+		public string Error
+		{
+			get
+			{
 				return this.error;
 			}
 		}
@@ -57,7 +64,8 @@ public string Error {
 		/// Sets the error message.
 		/// </summary>
 		/// <param name="errorMessage"></param>
-		public void SetError(string errorMessage) {
+		public void SetError(string errorMessage)
+		{
 			error = errorMessage;
 		}
 
@@ -67,8 +75,10 @@ public void SetError(string errorMessage) {
 		///     is accusing any error.
 		/// </summary>
 		/// <value> The tile state. </value>
-		public State CurrentState {
-			get {
+		public State CurrentState
+		{
+			get
+			{
 				return this.state;
 			}
 		}
@@ -79,7 +89,8 @@ public State CurrentState {
 		/// </summary>
 		/// <param name="param"> Initialization parameters. </param>
 		/// <param name="callback"> The completion callback. </param>
-		public void Initialize(Parameters param, Action callback) {
+		public void Initialize(Parameters param, Action callback)
+		{
 			this.Cancel();
 
 			this.state = State.Loading;
@@ -96,7 +107,8 @@ public void Initialize(Parameters param, Action callback) {
 		///     A <see cref="T:System.String"/> that represents the current
 		///     <see cref="T:Mapbox.Map.Tile"/>.
 		/// </returns>
-		public override string ToString() {
+		public override string ToString()
+		{
 			return this.Id.ToString();
 		}
 
@@ -104,8 +116,30 @@ public override string ToString() {
 		///     Cancels the request for the <see cref="T:Mapbox.Map.Tile"/> object.
 		///     It will stop a network request and set the tile's state to Canceled.
 		/// </summary>
-		public void Cancel() {
-			if (this.request != null) {
+		/// <example>
+		/// <code>
+		/// // Do not request tiles that we are already requesting
+		///	// but at the same time exclude the ones we don't need
+		///	// anymore, cancelling the network request.
+		///	this.tiles.RemoveWhere((T tile) =>
+		///	{
+		///		if (cover.Remove(tile.Id))
+		///		{
+		///			return false;
+		///		}
+		///		else
+		///		{
+		///			tile.Cancel();
+		///			this.NotifyNext(tile);
+		///			return true;			
+		/// 	}
+		///	});
+		/// </code>
+		/// </example>
+		public void Cancel()
+		{
+			if (this.request != null)
+			{
 				this.request.Cancel();
 				this.request = null;
 			}
@@ -125,10 +159,14 @@ public void Cancel() {
 		// a Worker class to abstract this, so on platforms that support threads (like Unity
 		// on the desktop, Android, etc) we can use worker threads and when building for
 		// the browser, we keep it single-threaded.
-		private void HandleTileResponse(Response response) {
-			if (!string.IsNullOrEmpty(response.Error)) {
+		private void HandleTileResponse(Response response)
+		{
+			if (!string.IsNullOrEmpty(response.Error))
+			{
 				this.error = response.Error;
-			} else if (this.ParseTileData(response.Data) == false) {
+			}
+			else if (this.ParseTileData(response.Data) == false)
+			{
 				this.error = "ParseError";
 			}
 
@@ -139,7 +177,16 @@ private void HandleTileResponse(Response response) {
 		/// <summary>
 		///    Parameters for initializing a Tile object.
 		/// </summary>
-		public struct Parameters {
+		/// <example>
+		/// <code>
+		/// var parameters = new Tile.Parameters();
+		/// parameters.Fs = MapboxAccess.Instance;
+		/// parameters.Id = new CanonicalTileId(_zoom, _tileCoorindateX, _tileCoordinateY);
+		/// parameters.MapId = "mapbox.mapbox-streets-v7";
+		/// </code>
+		/// </example>
+		public struct Parameters
+		{
 			/// <summary> The tile id. </summary>
 			public CanonicalTileId Id;
 
diff --git a/src/Map/TileCover.cs b/src/Map/TileCover.cs
index ae83c39..2710194 100644
--- a/src/Map/TileCover.cs
+++ b/src/Map/TileCover.cs
@@ -1,30 +1,55 @@
-//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
 // <copyright file="TileCover.cs" company="Mapbox">
 //     Copyright (c) 2016 Mapbox. All rights reserved.
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace Mapbox.Map 
+namespace Mapbox.Map
 {
-    using System;
-    using System.Collections.Generic;
-    using Mapbox.Utils;
+	using System;
+	using System.Collections.Generic;
+	using Mapbox.Utils;
 
-    /// <summary>
-    ///     Helper funtions to get a tile cover, i.e. a set of tiles needed for
-    ///     covering a bounding box.
-    /// </summary>
-    public static class TileCover {
+	/// <summary>
+	///     Helper funtions to get a tile cover, i.e. a set of tiles needed for
+	///     covering a bounding box.
+	/// </summary>
+	public static class TileCover
+	{
 		/// <summary> Get a tile cover for the specified bounds and zoom. </summary>
 		/// <param name="bounds"> Geographic bounding box.</param>
 		/// <param name="zoom"> Zoom level. </param>
 		/// <returns> The tile cover set. </returns>
-		public static HashSet<CanonicalTileId> Get(Vector2dBounds bounds, int zoom) {
+		/// <example>
+		/// Build a map of Colorado using TileCover:
+		/// <code>
+		/// var sw = new Vector2d(36.997749, -109.0524961);
+		/// var ne = new Vector2d(41.0002612, -102.0609668);
+		/// var coloradoBounds = new Vector2dBounds(sw, ne);
+		/// var tileCover = TileCover.Get(coloradoBounds, 8);
+		/// Console.Write("Tiles Needed: " + tileCover.Count);
+		/// foreach (var id in tileCover)
+		/// {
+		/// 	var tile = new RasterTile();
+		/// 	var parameters = new Tile.Parameters();
+		/// 	parameters.Id = id;
+		///		parameters.Fs = MapboxAccess.Instance;
+		///		parameters.MapId = "mapbox://styles/mapbox/outdoors-v10";
+		///		tile.Initialize(parameters, (Action)(() =&gt;
+		///		{
+		///			// Place tiles and load textures.
+		///		}));
+		///	}
+		/// </code>
+		/// </example>
+		public static HashSet<CanonicalTileId> Get(Vector2dBounds bounds, int zoom)
+		{
 			var tiles = new HashSet<CanonicalTileId>();
 
-			if(bounds.IsEmpty() ||
+			if (bounds.IsEmpty() ||
 				bounds.South > Constants.LatitudeMax ||
-				bounds.North < -Constants.LatitudeMax) {
+				bounds.North < -Constants.LatitudeMax)
+			{
 				return tiles;
 			}
 
@@ -36,8 +61,10 @@ public static HashSet<CanonicalTileId> Get(Vector2dBounds bounds, int zoom) {
 			var ne = CoordinateToTileId(hull.NorthEast, zoom);
 
 			// Scanlines.
-			for(var x = sw.X; x <= ne.X; ++x) {
-				for(var y = ne.Y; y <= sw.Y; ++y) {
+			for (var x = sw.X; x <= ne.X; ++x)
+			{
+				for (var y = ne.Y; y <= sw.Y; ++y)
+				{
 					tiles.Add(new UnwrappedTileId(zoom, x, y).Canonical);
 				}
 			}
@@ -49,7 +76,15 @@ public static HashSet<CanonicalTileId> Get(Vector2dBounds bounds, int zoom) {
 		/// <param name="coord"> Geographic coordinate. </param>
 		/// <param name="zoom"> Zoom level. </param>
 		/// <returns>The to tile identifier.</returns>
-		public static UnwrappedTileId CoordinateToTileId(Vector2d coord, int zoom) {
+		/// <example>
+		/// Convert a geocoordinate to a TileId:
+		/// <code>
+		/// var unwrappedTileId = TileCover.CoordinateToTileId(new Vector2d(40.015, -105.2705), 18);
+		/// Console.Write("UnwrappedTileId: " + unwrappedTileId.ToString());
+		/// </code>
+		/// </example>
+		public static UnwrappedTileId CoordinateToTileId(Vector2d coord, int zoom)
+		{
 			var lat = coord.x;
 			var lng = coord.y;
 
diff --git a/src/Map/VectorTile.cs b/src/Map/VectorTile.cs
index 7303e37..93e5bd7 100644
--- a/src/Map/VectorTile.cs
+++ b/src/Map/VectorTile.cs
@@ -4,25 +4,44 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace Mapbox.Map {
-
-
+namespace Mapbox.Map
+{
 	using System.Collections.ObjectModel;
 	using Mapbox.Utils;
 	using Mapbox.VectorTile;
 	using Mapbox.VectorTile.ExtensionMethods;
 	using System;
 
-
 	/// <summary>
 	///    A decoded vector tile, as specified by the
 	///    <see href="https://www.mapbox.com/vector-tiles/specification/">
-	///    Mapbox Vector Tile specification </see>. The tile might be
-	///    incomplete if the network request and parsing are still pending.
+	///    Mapbox Vector Tile specification</see>. 
+	///    See available layers and features <see href="https://www.mapbox.com/vector-tiles/mapbox-streets-v7/">here</see>.
+	///    The tile might be incomplete if the network request and parsing are still pending.
 	/// </summary>
-	public sealed class VectorTile : Tile, IDisposable {
-
-
+	///  <example>
+	/// Making a VectorTile request:
+	/// <code>
+	/// var parameters = new Tile.Parameters();
+	/// parameters.Fs = MapboxAccess.Instance;
+	/// parameters.Id = new CanonicalTileId(_zoom, _tileCoorindateX, _tileCoordinateY);
+	/// parameters.MapId = "mapbox.mapbox-streets-v7";
+	/// var vectorTile = new VectorTile();
+	/// 
+	/// // Make the request.
+	/// vectorTile.Initialize(parameters, (Action)(() =>
+	/// {
+	/// 	if (!string.IsNullOrEmpty(vectorTile.Error))
+	/// 	{
+	///			// Handle the error.
+	///		}
+	/// 
+	/// 	// Consume the <see cref="Data"/>.
+	///	}));
+	/// </code>
+	/// </example>
+	public sealed class VectorTile : Tile, IDisposable
+	{
 		// FIXME: Namespace here is very confusing and conflicts (sematically)
 		// with his class. Something has to be renamed here.
 		private Mapbox.VectorTile.VectorTile data;
@@ -31,8 +50,10 @@ public sealed class VectorTile : Tile, IDisposable {
 
 		/// <summary> Gets the vector decoded using Mapbox.VectorTile library. </summary>
 		/// <value> The GeoJson data. </value>
-		public Mapbox.VectorTile.VectorTile Data {
-			get {
+		public Mapbox.VectorTile.VectorTile Data
+		{
+			get
+			{
 				return this.data;
 			}
 		}
@@ -46,18 +67,23 @@ public Mapbox.VectorTile.VectorTile Data {
 		//}
 
 
-		public void Dispose() {
+		public void Dispose()
+		{
 			Dispose(true);
 			GC.SuppressFinalize(this);
 		}
 
 		//TODO: change signature if 'VectorTile' class changes from 'sealed'
 		//protected override void Dispose(bool disposeManagedResources)
-		public void Dispose(bool disposeManagedResources) {
-			if(!isDisposed) {
-				if(disposeManagedResources) {
+		public void Dispose(bool disposeManagedResources)
+		{
+			if (!isDisposed)
+			{
+				if (disposeManagedResources)
+				{
 					//TODO implement IDisposable with Mapbox.VectorTile.VectorTile
-					if(null != data) {
+					if (null != data)
+					{
 						data = null;
 					}
 				}
@@ -72,46 +98,82 @@ public void Dispose(bool disposeManagedResources) {
 		/// </para>
 		/// </summary>
 		/// <value> The GeoJson data. </value>
-		public string GeoJson {
-			get {
+		/// <example>
+		/// Inspect the GeoJson.
+		/// <code>
+		/// var json = VectorTile.GeoJson;
+		/// Console.Write("GeoJson: " + json);
+		/// </code>
+		/// </example>
+		public string GeoJson
+		{
+			get
+			{
 				return this.data.ToGeoJson((ulong)Id.Z, (ulong)Id.X, (ulong)Id.Y, 0);
 			}
 		}
 
 
-
 		/// <summary>
 		/// Gets all availble layer names.
+		/// See available layers and features <see href="https://www.mapbox.com/vector-tiles/mapbox-streets-v7/">here</see>.
 		/// </summary>
 		/// <returns>Collection of availble layers.</returns>
-		public ReadOnlyCollection<string> LayerNames() {
+		/// <example>
+		/// Inspect the LayerNames.
+		/// <code>
+		/// var layerNames = vectorTile.LayerNames();
+		/// foreach (var layer in layerNames)
+		/// {
+		/// 	Console.Write("Layer: " + layer);
+		/// }
+		/// </code>
+		/// </example>
+		public ReadOnlyCollection<string> LayerNames()
+		{
 			return this.data.LayerNames();
 		}
 
-
+		// FIXME: Why don't these work?
 		/// <summary>
 		/// Decodes the requested layer.
 		/// </summary>
 		/// <param name="layerName">Name of the layer to decode.</param>
 		/// <returns>Decoded VectorTileLayer or 'null' if an invalid layer name was specified.</returns>
-		public VectorTileLayer GetLayer(string layerName) {
+		/// <example>
+		/// Inspect a layer of the vector tile.
+		/// <code>
+		/// var countryLabelLayer = vectorTile.GetLayer("country_label");
+		/// var count = countryLabelLayer.Keys.Count;
+		/// for (int i = 0; i &lt; count; i++)
+		/// {
+		/// 	Console.Write(string.Format("{0}:{1}", countryLabelLayer.Keys[i], countryLabelLayer.Values[i]));
+		/// }
+		/// </code>
+		/// </example>
+		public VectorTileLayer GetLayer(string layerName)
+		{
 			return this.data.GetLayer(layerName);
 		}
 
 
-		internal override TileResource MakeTileResource(string mapId) {
+		internal override TileResource MakeTileResource(string mapId)
+		{
 			return TileResource.MakeVector(Id, mapId);
 		}
 
 
-		internal override bool ParseTileData(byte[] data) {
-			try {
+		internal override bool ParseTileData(byte[] data)
+		{
+			try
+			{
 				var decompressed = Compression.Decompress(data);
 				this.data = new Mapbox.VectorTile.VectorTile(decompressed);
 
 				return true;
 			}
-			catch(Exception ex) {
+			catch (Exception ex)
+			{
 				SetError("VectorTile parsing failed: " + ex.ToString());
 				return false;
 			}
@@ -119,4 +181,4 @@ internal override bool ParseTileData(byte[] data) {
 
 
 	}
-}
+}
\ No newline at end of file
diff --git a/test/UnitTest/BboxToGeoCoordinateBoundsConverterTest.cs b/test/UnitTest/BboxToGeoCoordinateBoundsConverterTest.cs
index eed7acd..2c57b52 100644
--- a/test/UnitTest/BboxToGeoCoordinateBoundsConverterTest.cs
+++ b/test/UnitTest/BboxToGeoCoordinateBoundsConverterTest.cs
@@ -17,8 +17,8 @@ internal class BboxToVector2dBoundsConverterTest
         private string geoCoordinateBoundsStr = "[38.9165,-77.0295,30.2211,-80.5521]";
 
         private Vector2dBounds geoCoordinateBoundsObj = new Vector2dBounds(
-            sw: new Vector2d(x: -77.0295, y: 38.9165),
-            ne: new Vector2d(x: -80.5521, y: 30.2211));
+            sw: new Vector2d(y: -77.0295, x: 38.9165),
+            ne: new Vector2d(y: -80.5521, x: 30.2211));
 
         [Test]
         public void Deserialize()
diff --git a/test/UnitTest/LonLatToGeoCoordinateConverterTest.cs b/test/UnitTest/LonLatToGeoCoordinateConverterTest.cs
index 515ca33..e83fc61 100644
--- a/test/UnitTest/LonLatToGeoCoordinateConverterTest.cs
+++ b/test/UnitTest/LonLatToGeoCoordinateConverterTest.cs
@@ -14,20 +14,23 @@ namespace Mapbox.UnitTest
     [TestFixture]
     internal class LonLatToVector2dConverterTest
     {
+		// Mapbox API returns longitude,latitude
         private string lonLatStr = "[-77.0295,38.9165]";
-        private Vector2d lonLatObj = new Vector2d(x: -77.0295, y: 38.9165);
 
+		// In Unity, x = latitude, y = longitude
+		private Vector2d latLonObject = new Vector2d(y: -77.0295, x: 38.9165);
+		
         [Test]
         public void Deserialize()
         {
             Vector2d deserializedLonLat = JsonConvert.DeserializeObject<Vector2d>(this.lonLatStr, JsonConverters.Converters);
-            Assert.AreEqual(this.lonLatObj.ToString(), deserializedLonLat.ToString());
+            Assert.AreEqual(this.latLonObject.ToString(), deserializedLonLat.ToString());
         }
 
         [Test]
         public void Serialize()
         {
-            string serializedLonLat = JsonConvert.SerializeObject(this.lonLatObj, JsonConverters.Converters);
+            string serializedLonLat = JsonConvert.SerializeObject(this.latLonObject, JsonConverters.Converters);
             Assert.AreEqual(this.lonLatStr, serializedLonLat);
         }
     }
diff --git a/test/UnitTest/MapTest.cs b/test/UnitTest/MapTest.cs
index 8185310..f0b4a06 100644
--- a/test/UnitTest/MapTest.cs
+++ b/test/UnitTest/MapTest.cs
@@ -32,6 +32,7 @@ public void World()
 
 			var mapObserver = new Utils.VectorMapObserver();
 			map.Subscribe(mapObserver);
+			map.Update();
 
 			this.fs.WaitForAllRequests();
 
@@ -50,6 +51,7 @@ public void RasterHelsinki()
 
 			var mapObserver = new Utils.RasterMapObserver();
 			map.Subscribe(mapObserver);
+			map.Update();
 
 			this.fs.WaitForAllRequests();
 
@@ -72,16 +74,19 @@ public void ChangeMapId()
 			map.Center = new Vector2d(60.163200, 24.937700);
 			map.Zoom = 13;
 			map.MapId = "invalid";
+			map.Update();
 
 			this.fs.WaitForAllRequests();
 			Assert.AreEqual(0, mapObserver.Tiles.Count);
 
 			map.MapId = "mapbox.terrain-rgb";
+			map.Update();
 
 			this.fs.WaitForAllRequests();
 			Assert.AreEqual(1, mapObserver.Tiles.Count);
 
 			map.MapId = null; // Use default map ID.
+			map.Update();
 
 			this.fs.WaitForAllRequests();
 			Assert.AreEqual(2, mapObserver.Tiles.Count);
@@ -112,10 +117,12 @@ public void TileMax()
 			var map = new Map<RasterTile>(this.fs);
 
 			map.SetVector2dBoundsZoom(Vector2dBounds.World(), 2);
+			map.Update();
 			Assert.Less(map.Tiles.Count, Map<RasterTile>.TileMax); // 16
 
 			// Should stay the same, ignore requests.
 			map.SetVector2dBoundsZoom(Vector2dBounds.World(), 5);
+			map.Update();
 			Assert.AreEqual(16, map.Tiles.Count);
 		}
 
diff --git a/test/UnitTest/VectorTileTest.cs b/test/UnitTest/VectorTileTest.cs
index 87155be..feda959 100644
--- a/test/UnitTest/VectorTileTest.cs
+++ b/test/UnitTest/VectorTileTest.cs
@@ -34,6 +34,7 @@ public void ParseSuccess() {
 
 			for (int zoom = 0; zoom < 15; ++zoom) {
 				map.Zoom = zoom;
+				map.Update();
 				this.fs.WaitForAllRequests();
 			}
 
@@ -70,6 +71,7 @@ public void ParseFailure() {
 
 			map.Center = new Vector2d(60.163200, 60.163200);
 			map.Zoom = 13;
+			map.Update();
 
 			mockFs.WaitForAllRequests();
 
@@ -89,6 +91,7 @@ public void SeveralTiles() {
 
 			map.Vector2dBounds = Vector2dBounds.World();
 			map.Zoom = 3; // 64 tiles.
+			map.Update();
 
 			this.fs.WaitForAllRequests();