diff --git a/content/implementations.html b/content/implementations.html
index 7897fae2..c0e1ad39 100644
--- a/content/implementations.html
+++ b/content/implementations.html
@@ -58,6 +58,7 @@ <h3>PHP</h3>
 	<h3>.NET</h3>
 	<ul>
 		<li><a id="link-impl-json-net" href="http://james.newtonking.com/projects/json-net.aspx">Json.NET</a> (MIT)</li>
+		<li><a id="link-impl-n-json-schema" href="http://NJsonSchema.org">NJsonSchema</a> - <em>supports version 4</em> (Ms-PL)</li>
 	</ul>
 
 	<h3>ActionScript 3</h3>
@@ -70,6 +71,11 @@ <h3>C</h3>
 		<li><a id="link-impl-wjelement" href="https://github.com/netmail-open/wjelement">WJElement</a> (LGPLv3)</li>
 	</ul>
 
+	<h3>C++</h3>
+	<ul>
+		<li><a id="link-impl-wjelement" href="https://github.com/petehug/wjelement-cpp">wjelement-cpp</a> - <em>supports version 4</em> (LGPLv3)</li>
+	</ul>
+
 	<h3>Haskell</h3>
 	<ul>
 		<li><a id="link-impl-aeson-schema" href="https://github.com/timjb/aeson-schema">aeson-schema</a> (MIT)</li>
@@ -86,6 +92,11 @@ <h3>Go</h3>
 		<li><a id="link-impl-gojsonschema" href="https://github.com/sigu-399/gojsonschema">gojsonschema</a> (Apache 2.0)</li>
 	</ul>
 
+	<h3>Dart</h3>
+	<ul>
+		<li><a id="link-impl-dart-jsonschema" href="https://github.com/patefacio/json_schema">json_schema</a> <em>supports  version 4</em> (BSL-1.0)</li>
+	</ul>
+
 	<h3>Online (web tool)</h3>
 	<ul>
 		<li><a id="link-impl-schemastore" href="http://schemastore.org/validator/">SchemaStore.org</a> - validate against common JSON Schemas</li>
@@ -98,6 +109,7 @@ <h2>Schema generation (7)</h2>
 	<h3>.NET</h3>
 	<ul>
 		<li><a id="link-impl-json-net" href="http://james.newtonking.com/projects/json-net.aspx">Json.NET</a> (MIT) - generates schemas from .NET types</li>
+		<li><a id="link-impl-n-json-schema" href="http://NJsonSchema.org">NJsonSchema</a> - <em>supports version 4</em> (Ms-PL) - generates schemas from .NET types</li>
 	</ul>
 
 	<h3>Online (web tool)</h3>
diff --git a/example1.html b/example1.html
index 6d1f153d..b9969b5b 100644
--- a/example1.html
+++ b/example1.html
@@ -211,7 +211,7 @@ <h3>Are all tags strings?</h3>
 
 <h2>Summary</h2>
 <div class="block">
-    <p>The above example is by no means definitive of all the types of data JSON schema can define. For more definitive information see the <a href="#definitions">full standard draft</a>.</p>
+    <p>The above example is by no means definitive of all the types of data JSON schema can define. For more definitive information see the <a href="draft-04/schema#definitions">full standard draft</a>.</p>
     <p>As a final example, here's a spec for an array of products, with the products having 2 new properties. The first is a <em>dimensions</em> property for the size of the product, and the second is a <em>warehouseLocation</em> field for where the warehouse that stores them is geographically located.</p>
     <p>And also, since JSON Schema defines a reference schema for a geographic location, instead of coming up with our own, we'll reference the <a href="http://json-schema.org/geo">canonical one</a>.</p>
 
diff --git a/implementations.html b/implementations.html
index 58ca5d6b..e58c7798 100644
--- a/implementations.html
+++ b/implementations.html
@@ -2,7 +2,7 @@
 	<head>
 		<title>JSON Schema Software</title>
 		<link href="style/css/green-theme.css" rel="stylesheet">
-		<link rel="stylesheet" href="style/css/json-highlight.css"></link>
+		<link rel="stylesheet" href="style/css/json-highlight.css">
 		<script type="text/javascript">
 			var _gaq = _gaq || [];
 			var pluginUrl = '//www.google-analytics.com/plugins/ga/inpage_linkid.js';
@@ -42,6 +42,7 @@ <h2>Validators (37)</h2>
 <div class="block" id="validator-list">
 	<h3>JavaScript</h3>
 	<ul>
+		<li><a id="link-impl-jsen" href="https://github.com/bugventure/jsen">JSEN</a> - <em>supports version 4</em> (MIT)</li>
 		<li><a id="link-impl-ajv" href="https://github.com/epoberezkin/ajv">ajv</a> - <em>supports version 4</em> (MIT)</li>
 		<li><a id="link-impl-is-my-json-valid" href="https://github.com/mafintosh/is-my-json-valid">is-my-json-valid</a> - <em>supports version 4</em> (MIT)</li>
 		<li><a id="link-impl-tv4" href="http://geraintluff.github.com/tv4/">tv4</a> - <em>supports version 4</em> (Public Domain)</li>
@@ -58,6 +59,7 @@ <h3>JavaScript</h3>
 	<h3>Java</h3>
 	<ul>
 		<li><a id="link-impl-fge-json-schema-validator" href="https://github.com/fge/json-schema-validator">json-schema-validator</a> - <em>supports version 4</em> (LGPLv3)</li>
+		<li><a id="link-impl-everit-json-schema" href="https://github.com/everit-org/json-schema">json-schema (implementation based on the org.json API)</a> - <em>supports version 4</em> (Apache License 2.0)</li>
 	</ul>
 
 	<h3>Python</h3>
@@ -118,6 +120,7 @@ <h3>C++</h3>
 	<h3>Haskell</h3>
 	<ul>
 		<li><a id="link-impl-aeson-schema" href="https://github.com/timjb/aeson-schema">aeson-schema</a> (MIT)</li>
+		<li><a id="link-impl-hjsonschema" href="https://github.com/seagreen/hjsonschema">hjsonschema</a> (MIT)</li>
 	</ul>
 
 	<h3>Erlang</h3>
@@ -132,7 +135,13 @@ <h3>Go</h3>
 	<h3>Objective-C</h3>
 	<ul>
 		<li><a id="link-impl-kitejsonvalidator" href="https://github.com/samskiter/KiteJSONValidator">KiteJSONValidator</a> (MIT)</li>
+  </ul>
+
+	<h3>Dart</h3>
+	<ul>
+		<li><a id="link-impl-dart-jsonschema" href="https://github.com/patefacio/json_schema">json_schema</a> <em>supports  version 4</em> (BSL-1.0)</li>
 	</ul>
+
 </div>
 
 <div class="show-hide" data-target="schema-generation-list"></div>
@@ -162,6 +171,28 @@ <h3>Python</h3>
 	<ul>
 		<li><a id="link-impl-jsl" href="https://github.com/aromanovich/jsl">JSL</a> (BSD) - a Python DSL for defining JSON Schemas</li>
 	</ul>
+
+	<h3>Java</h3>
+	<ul>
+		<li><a id="link-impl-java" href="https://github.com/FasterXML/jackson-module-jsonSchema">Jackson JSON Schema Module</a> - (Apache 2.0)</li>
+	</ul>
+	
+	<h3>Haskell</h3>
+	<ul>
+		<li><a id="link-impl-jsonschema-gen" href="https://github.com/yuga/jsonschema-gen">jsonschema-gen</a> (BSD3) -  A generator for JSON Schema from Algebraic Data Type in Haskell.
+</li>
+	</ul>
+</div>
+
+<div class="show-hide" data-target="data-generation-list"></div>
+<h2>Data generation (4)</h2>
+<div class="block" id="data-generation-list">
+	<h3>JavaScript</h3>
+	<ul>
+		<li><a id="link-impl-json-schema-faker" href="https://github.com/json-schema-faker/json-schema-faker">JSON Schema Faker</a> - generates fake data based on JSON Schema</li>
+		<li><a id="link-impl-schematic-ipsum" href="http://schematic-ipsum.herokuapp.com/">Schematic Ipsum</a> (MIT)</li>
+		<li><a id="link-impl-json-schema-instantiator" href="https://github.com/tomarad/JSON-Schema-Instantiator">JSON-Schema-Instantiator</a> (MIT)</li>
+		<li><a id="link-impl-json-schema-random" href="https://github.com/andreineculau/json-schema-random">JSON Schema Random</a> (Apache 2.0)</li>
 </div>
 <div class="show-hide" data-target="code-generation-list"></div>
 <h2>Code generation (1)</h2>
@@ -231,6 +262,16 @@ <h3>Ruby</h3>
   <ul>
     <li><a id="link-impl-hyper-brandur-json-schema" href="https://github.com/brandur/json_schema">json_schema</a> <em>supports version 4 and hyperschema</em> (MIT)</li>
   </ul>
+
+  <h3>Python</h3>
+  <ul>
+    <li><a id="link-impl-coreapi-python" href="https://github.com/core-api/python-client">coreapi python</a> - A client library for interacting with APIs using JSON HyperSchema</li>
+  </ul>
+
+  <h3>Command line</h3>
+  <ul>
+    <li><a id="link-impl-coreapi-command-line-client" href="http://www.coreapi.org/tools-and-resources/command-line-client/">coreapi command line client</a> - A command line client for interacting with APIs using JSON HyperSchema.</li>
+  </ul>
 </div>
 
 <div class="show-hide" data-target="documentation-list"></div>
@@ -250,15 +291,12 @@ <h3>Ruby</h3>
 </div>
 
 <div class="show-hide" data-target="other-list"></div>
-<h2>Other (5)</h2>
+<h2>Other (2)</h2>
 <div class="block" id="other-list">
 	<h3>JavaScript</h3>
 	<ul>
 		<li><a id="link-impl-orderly" href="http://orderly-json.org">Orderly</a> (BSD)</li>
 		<li><a id="link-impl-dojo" href="http://www.dojotoolkit.org/">Dojo</a> (AFL or BSD) - supports some aspects of JSON Schema</li>
-		<li><a id="link-impl-schematic-ipsum" href="http://schematic-ipsum.herokuapp.com/">Schematic Ipsum</a> (MIT)</li>
-		<li><a id="link-impl-json-schema-instantiator" href="https://github.com/tomarad/JSON-Schema-Instantiator">JSON-Schema-Instantiator</a> (MIT)</li>
-		<li><a id="link-impl-json-schema-random" href="https://github.com/andreineculau/json-schema-random">JSON Schema Random</a> (Apache 2.0)</li>
 	</ul>
 </div>
 			</div>
