diff --git a/README.markdown b/README.markdown
index e7801ec..d524c7e 100644
--- a/README.markdown
+++ b/README.markdown
@@ -7,7 +7,7 @@ Building from source and deploying into Neo4j Server
 
 Ensure Maven knows where to find Java 1.7. **Note**: on Mac OSX (tested on 10.9), please see this issue/workaround [StackOverflow](http://stackoverflow.com/questions/17824889/how-to-force-maven-3-1-to-use-right-version-of-java-on-mac-os-8-10).
 
-Also ensure you do not have neo4j currently running or the build tests will fail as it attempts to start up a neo4j instance on the same port as the defaults for neo4j. Otherwise the tests and the build will fail.
+Also ensure you do **not** have neo4j currently running or the build tests will fail as it attempts to start up a neo4j instance on the same port as the defaults for neo4j. Otherwise the tests and the build will fail.
 
     mvn clean package
     unzip target/neo4j-gremlin-plugin-2.1-SNAPSHOT-server-plugin.zip -d $NEO4J_HOME/plugins/gremlin-plugin
diff --git a/src/data/graphml1.xml b/src/data/graphml1.xml
index 3cdfaf4..26bf210 100644
--- a/src/data/graphml1.xml
+++ b/src/data/graphml1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2002-2015 "Neo Technology,"
+    Copyright (c) 2002-2016 "Neo Technology,"
     Network Engine for Objects in Lund AB [http://neotechnology.com]
 
     This file is part of Neo4j.
@@ -45,4 +45,4 @@
             <data key="weight">0.8</data>
         </edge>
     </graph>
-</graphml>
\ No newline at end of file
+</graphml>
diff --git a/src/main/assembly/docs-assembly.xml b/src/main/assembly/docs-assembly.xml
index 047b29b..bfd710c 100644
--- a/src/main/assembly/docs-assembly.xml
+++ b/src/main/assembly/docs-assembly.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2002-2015 "Neo Technology,"
+    Copyright (c) 2002-2016 "Neo Technology,"
     Network Engine for Objects in Lund AB [http://neotechnology.com]
 
     This file is part of Neo4j.
diff --git a/src/main/assembly/server-plugin.xml b/src/main/assembly/server-plugin.xml
index 3ed3842..566c947 100644
--- a/src/main/assembly/server-plugin.xml
+++ b/src/main/assembly/server-plugin.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2002-2015 "Neo Technology,"
+    Copyright (c) 2002-2016 "Neo Technology,"
     Network Engine for Objects in Lund AB [http://neotechnology.com]
 
     This file is part of Neo4j.
@@ -32,4 +32,4 @@
       <scope>runtime</scope>
     </dependencySet>
   </dependencySets>
-</assembly>
\ No newline at end of file
+</assembly>
diff --git a/src/main/java/org/neo4j/server/plugin/gremlin/CountingEngineReplacementDecision.java b/src/main/java/org/neo4j/server/plugin/gremlin/CountingEngineReplacementDecision.java
index 422d238..0f20426 100644
--- a/src/main/java/org/neo4j/server/plugin/gremlin/CountingEngineReplacementDecision.java
+++ b/src/main/java/org/neo4j/server/plugin/gremlin/CountingEngineReplacementDecision.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2002-2015 "Neo Technology,"
+ * Copyright (c) 2002-2016 "Neo Technology,"
  * Network Engine for Objects in Lund AB [http://neotechnology.com]
  *
  * This file is part of Neo4j.
diff --git a/src/main/java/org/neo4j/server/plugin/gremlin/EngineReplacementDecision.java b/src/main/java/org/neo4j/server/plugin/gremlin/EngineReplacementDecision.java
index 03c6907..ad88e3a 100644
--- a/src/main/java/org/neo4j/server/plugin/gremlin/EngineReplacementDecision.java
+++ b/src/main/java/org/neo4j/server/plugin/gremlin/EngineReplacementDecision.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2002-2015 "Neo Technology,"
+ * Copyright (c) 2002-2016 "Neo Technology,"
  * Network Engine for Objects in Lund AB [http://neotechnology.com]
  *
  * This file is part of Neo4j.
diff --git a/src/main/java/org/neo4j/server/plugin/gremlin/GremlinPlugin.java b/src/main/java/org/neo4j/server/plugin/gremlin/GremlinPlugin.java
index f15c7f6..4bd6460 100755
--- a/src/main/java/org/neo4j/server/plugin/gremlin/GremlinPlugin.java
+++ b/src/main/java/org/neo4j/server/plugin/gremlin/GremlinPlugin.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2002-2015 "Neo Technology,"
+ * Copyright (c) 2002-2016 "Neo Technology,"
  * Network Engine for Objects in Lund AB [http://neotechnology.com]
  *
  * This file is part of Neo4j.
diff --git a/src/main/java/org/neo4j/server/plugin/gremlin/ScriptCountingEngineReplacementDecision.java b/src/main/java/org/neo4j/server/plugin/gremlin/ScriptCountingEngineReplacementDecision.java
index e7e690f..5f0009c 100644
--- a/src/main/java/org/neo4j/server/plugin/gremlin/ScriptCountingEngineReplacementDecision.java
+++ b/src/main/java/org/neo4j/server/plugin/gremlin/ScriptCountingEngineReplacementDecision.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2002-2015 "Neo Technology,"
+ * Copyright (c) 2002-2016 "Neo Technology,"
  * Network Engine for Objects in Lund AB [http://neotechnology.com]
  *
  * This file is part of Neo4j.
diff --git a/src/main/java/org/neo4j/server/rest/repr/GremlinMapRepresentation.java b/src/main/java/org/neo4j/server/rest/repr/GremlinMapRepresentation.java
index 0861be3..332de54 100644
--- a/src/main/java/org/neo4j/server/rest/repr/GremlinMapRepresentation.java
+++ b/src/main/java/org/neo4j/server/rest/repr/GremlinMapRepresentation.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2002-2015 "Neo Technology,"
+ * Copyright (c) 2002-2016 "Neo Technology,"
  * Network Engine for Objects in Lund AB [http://neotechnology.com]
  *
  * This file is part of Neo4j.
diff --git a/src/main/java/org/neo4j/server/rest/repr/GremlinObjectToRepresentationConverter.java b/src/main/java/org/neo4j/server/rest/repr/GremlinObjectToRepresentationConverter.java
index 03bba95..61cc128 100644
--- a/src/main/java/org/neo4j/server/rest/repr/GremlinObjectToRepresentationConverter.java
+++ b/src/main/java/org/neo4j/server/rest/repr/GremlinObjectToRepresentationConverter.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2002-2015 "Neo Technology,"
+ * Copyright (c) 2002-2016 "Neo Technology,"
  * Network Engine for Objects in Lund AB [http://neotechnology.com]
  *
  * This file is part of Neo4j.
diff --git a/src/main/java/org/neo4j/server/rest/repr/GremlinTableRepresentation.java b/src/main/java/org/neo4j/server/rest/repr/GremlinTableRepresentation.java
index cfe8e79..9d29b2f 100644
--- a/src/main/java/org/neo4j/server/rest/repr/GremlinTableRepresentation.java
+++ b/src/main/java/org/neo4j/server/rest/repr/GremlinTableRepresentation.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2002-2015 "Neo Technology,"
+ * Copyright (c) 2002-2016 "Neo Technology,"
  * Network Engine for Objects in Lund AB [http://neotechnology.com]
  *
  * This file is part of Neo4j.
diff --git a/src/main/java/org/neo4j/server/webadmin/console/GremlinResultHook.java b/src/main/java/org/neo4j/server/webadmin/console/GremlinResultHook.java
index 1f12edd..45ff6c6 100644
--- a/src/main/java/org/neo4j/server/webadmin/console/GremlinResultHook.java
+++ b/src/main/java/org/neo4j/server/webadmin/console/GremlinResultHook.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2002-2015 "Neo Technology,"
+ * Copyright (c) 2002-2016 "Neo Technology,"
  * Network Engine for Objects in Lund AB [http://neotechnology.com]
  *
  * This file is part of Neo4j.
@@ -28,12 +28,11 @@
 import org.codehaus.groovy.tools.shell.IO;
 
 /**
- * Version of ResultHookClosure that does not add ==> to the output. This is
+ * Version of ResultHookClosure that does not add an arrow to the output. This is
  * instead moved to the console or print stream to handle, so that all content
  * printed to the output stream gets the same prompt.
  *
- * @author Marko A. Rodriguez (http://markorodriguez.com), Jacob Hansson
- *         <jacob@voltvoodoo.com>
+ * @author Marko A. Rodriguez (http://markorodriguez.com), Jacob Hansson (jacob@voltvoodoo.com)
  */
 public class GremlinResultHook extends Closure
 {
diff --git a/src/main/java/org/neo4j/server/webadmin/console/GremlinSession.java b/src/main/java/org/neo4j/server/webadmin/console/GremlinSession.java
index 4a8f304..c65ab55 100644
--- a/src/main/java/org/neo4j/server/webadmin/console/GremlinSession.java
+++ b/src/main/java/org/neo4j/server/webadmin/console/GremlinSession.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2002-2015 "Neo Technology,"
+ * Copyright (c) 2002-2016 "Neo Technology,"
  * Network Engine for Objects in Lund AB [http://neotechnology.com]
  *
  * This file is part of Neo4j.
@@ -75,7 +75,6 @@ public void execute(String script) {
      * Take some gremlin script, evaluate it in the context of this gremlin
      * session, and return the result.
      *
-     * @param script
      * @return the return string of the evaluation result, or the exception
      *         message.
      */
diff --git a/src/main/java/org/neo4j/server/webadmin/console/GremlinSessionCreator.java b/src/main/java/org/neo4j/server/webadmin/console/GremlinSessionCreator.java
index f5457b8..5fad2d5 100644
--- a/src/main/java/org/neo4j/server/webadmin/console/GremlinSessionCreator.java
+++ b/src/main/java/org/neo4j/server/webadmin/console/GremlinSessionCreator.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2002-2015 "Neo Technology,"
+ * Copyright (c) 2002-2016 "Neo Technology,"
  * Network Engine for Objects in Lund AB [http://neotechnology.com]
  *
  * This file is part of Neo4j.
diff --git a/src/main/java/org/neo4j/server/webadmin/console/GremlinWebConsole.java b/src/main/java/org/neo4j/server/webadmin/console/GremlinWebConsole.java
index 30d9670..dad3026 100644
--- a/src/main/java/org/neo4j/server/webadmin/console/GremlinWebConsole.java
+++ b/src/main/java/org/neo4j/server/webadmin/console/GremlinWebConsole.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2002-2015 "Neo Technology,"
+ * Copyright (c) 2002-2016 "Neo Technology,"
  * Network Engine for Objects in Lund AB [http://neotechnology.com]
  *
  * This file is part of Neo4j.
diff --git a/src/main/java/org/neo4j/server/webadmin/console/Neo4jGroovyImports.java b/src/main/java/org/neo4j/server/webadmin/console/Neo4jGroovyImports.java
index 294ed66..c22cfc2 100644
--- a/src/main/java/org/neo4j/server/webadmin/console/Neo4jGroovyImports.java
+++ b/src/main/java/org/neo4j/server/webadmin/console/Neo4jGroovyImports.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2002-2015 "Neo Technology,"
+ * Copyright (c) 2002-2016 "Neo Technology,"
  * Network Engine for Objects in Lund AB [http://neotechnology.com]
  *
  * This file is part of Neo4j.
diff --git a/src/site/site.xml b/src/site/site.xml
index f1febb3..91e21d8 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
 
-    Copyright (c) 2002-2015 "Neo Technology,"
+    Copyright (c) 2002-2016 "Neo Technology,"
     Network Engine for Objects in Lund AB [http://neotechnology.com]
 
     This file is part of Neo4j.
diff --git a/src/test/java/org/neo4j/server/plugin/gremlin/GremlinPluginFunctionalTest.java b/src/test/java/org/neo4j/server/plugin/gremlin/GremlinPluginFunctionalTest.java
index e8fc5cc..a682ecb 100644
--- a/src/test/java/org/neo4j/server/plugin/gremlin/GremlinPluginFunctionalTest.java
+++ b/src/test/java/org/neo4j/server/plugin/gremlin/GremlinPluginFunctionalTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2002-2015 "Neo Technology,"
+ * Copyright (c) 2002-2016 "Neo Technology,"
  * Network Engine for Objects in Lund AB [http://neotechnology.com]
  *
  * This file is part of Neo4j.
diff --git a/src/test/java/org/neo4j/server/plugin/gremlin/GremlinPluginTest.java b/src/test/java/org/neo4j/server/plugin/gremlin/GremlinPluginTest.java
index d728811..727ac63 100644
--- a/src/test/java/org/neo4j/server/plugin/gremlin/GremlinPluginTest.java
+++ b/src/test/java/org/neo4j/server/plugin/gremlin/GremlinPluginTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2002-2015 "Neo Technology,"
+ * Copyright (c) 2002-2016 "Neo Technology,"
  * Network Engine for Objects in Lund AB [http://neotechnology.com]
  *
  * This file is part of Neo4j.
diff --git a/src/test/java/org/neo4j/server/webadmin/console/GremlinSessionTest.java b/src/test/java/org/neo4j/server/webadmin/console/GremlinSessionTest.java
index 181910a..b747930 100644
--- a/src/test/java/org/neo4j/server/webadmin/console/GremlinSessionTest.java
+++ b/src/test/java/org/neo4j/server/webadmin/console/GremlinSessionTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2002-2015 "Neo Technology,"
+ * Copyright (c) 2002-2016 "Neo Technology,"
  * Network Engine for Objects in Lund AB [http://neotechnology.com]
  *
  * This file is part of Neo4j.
diff --git a/src/test/java/org/neo4j/server/webadmin/rest/ConfigureEnabledManagementConsolesGremlinTest.java b/src/test/java/org/neo4j/server/webadmin/rest/ConfigureEnabledManagementConsolesGremlinTest.java
index cabcfc9..5efab1a 100644
--- a/src/test/java/org/neo4j/server/webadmin/rest/ConfigureEnabledManagementConsolesGremlinTest.java
+++ b/src/test/java/org/neo4j/server/webadmin/rest/ConfigureEnabledManagementConsolesGremlinTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2002-2015 "Neo Technology,"
+ * Copyright (c) 2002-2016 "Neo Technology,"
  * Network Engine for Objects in Lund AB [http://neotechnology.com]
  *
  * This file is part of Neo4j.
diff --git a/src/test/java/org/neo4j/server/webadmin/rest/GremlinConsoleServiceTest.java b/src/test/java/org/neo4j/server/webadmin/rest/GremlinConsoleServiceTest.java
index 46687af..1e90fc7 100644
--- a/src/test/java/org/neo4j/server/webadmin/rest/GremlinConsoleServiceTest.java
+++ b/src/test/java/org/neo4j/server/webadmin/rest/GremlinConsoleServiceTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2002-2015 "Neo Technology,"
+ * Copyright (c) 2002-2016 "Neo Technology,"
  * Network Engine for Objects in Lund AB [http://neotechnology.com]
  *
  * This file is part of Neo4j.
diff --git a/src/test/resources/graphml.xml b/src/test/resources/graphml.xml
index 3cdfaf4..26bf210 100644
--- a/src/test/resources/graphml.xml
+++ b/src/test/resources/graphml.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2002-2015 "Neo Technology,"
+    Copyright (c) 2002-2016 "Neo Technology,"
     Network Engine for Objects in Lund AB [http://neotechnology.com]
 
     This file is part of Neo4j.
@@ -45,4 +45,4 @@
             <data key="weight">0.8</data>
         </edge>
     </graph>
-</graphml>
\ No newline at end of file
+</graphml>