diff --git a/rabbithole/core/boot.js b/rabbithole/core/boot.js
index c04b5a261..da365658c 100644
--- a/rabbithole/core/boot.js
+++ b/rabbithole/core/boot.js
@@ -24,8 +24,8 @@ In practice, each module is wrapped in a separate script block.
 \*/
 (function() {
 
-/*jslint node: true */
-/*global modules: false */
+/*jslint node: true, browser: true */
+/*global modules: false, $tw: false */
 "use strict";
 
 /////////////////////////// Setting up $tw
@@ -40,7 +40,7 @@ $tw.boot = {};
 
 // Modules store registers all the modules the system has seen
 $tw.modules = $tw.modules || {};
-$tw.modules.titles = $tw.modules.titles || {} // hashmap by module title of {fn:, exports:, moduleType:}
+$tw.modules.titles = $tw.modules.titles || {}; // hashmap by module title of {fn:, exports:, moduleType:}
 
 // Plugins store organises module exports by module type
 $tw.plugins = $tw.plugins || {};
@@ -75,7 +75,7 @@ Determine if a value is an array
 */
 $tw.utils.isArray = function(value) {
 	return Object.prototype.toString.call(value) == "[object Array]";
-}
+};
 
 // Convert "&amp;" to &, "&lt;" to <, "&gt;" to > and "&quot;" to "
 $tw.utils.htmlDecode = function(s) {
@@ -88,8 +88,9 @@ Pad a string to a given length with "0"s. Length defaults to 2
 $tw.utils.pad = function(value,length) {
 	length = length || 2;
 	var s = value.toString();
-	if(s.length < length)
+	if(s.length < length) {
 		s = "000000000000000000000000000".substr(0,length - s.length) + s;
+	}
 	return s;
 };
 
@@ -367,8 +368,8 @@ $tw.Wiki.prototype.deserializeTiddlers = function(type,text,srcFields) {
 		deserializer = $tw.Wiki.tiddlerDeserializerPlugins[type];
 	}
 	for(var f in srcFields) {
-		fields[f] = srcFields[f]
-	};
+		fields[f] = srcFields[f];
+	}
 	if(deserializer) {
 		return deserializer.call(this,text,fields);
 	} else {
@@ -564,7 +565,7 @@ $tw.plugins.loadPlugins = function(filepath,basetitle,excludeRegExp) {
 			$tw.plugins.loadTiddlersFromFile(filepath,basetitle);
 		}
 	}
-}
+};
 
 /*
 Execute the module named 'moduleName'. The name can optionally be relative to the module named 'moduleRoot'
@@ -599,7 +600,7 @@ $tw.modules.execute = function(moduleName,moduleRoot) {
 	}
 	// Return the exports of the module
 	return module.exports;
-}
+};
 
 // Load plugins from the plugins directory
 $tw.plugins.loadPlugins(path.resolve($tw.boot.bootPath,$tw.config.bootModuleSubDir));
diff --git a/rabbithole/core/modules/commander.js b/rabbithole/core/modules/commander.js
index ece4b7e32..cab488704 100644
--- a/rabbithole/core/modules/commander.js
+++ b/rabbithole/core/modules/commander.js
@@ -9,6 +9,7 @@ The $tw.Commander class is a command interpreter
 (function(){
 
 /*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 /*
diff --git a/rabbithole/core/modules/commands/dump.js b/rabbithole/core/modules/commands/dump.js
index a0d3ec899..a42b73f50 100644
--- a/rabbithole/core/modules/commands/dump.js
+++ b/rabbithole/core/modules/commands/dump.js
@@ -8,13 +8,14 @@ Dump command
 \*/
 (function(){
 
-/*jslint node: true, browser: true */
+/*jshint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.info = {
 	name: "dump",
 	synchronous: true
-}
+};
 
 var Command = function(params,commander) {
 	this.params = params;
@@ -32,13 +33,13 @@ Command.prototype.execute = function() {
 	} else {
 		return "Unknown subcommand (" + this.params[0] + ") for dump command";
 	}
-}
+};
 
 Command.prototype.subcommands = {};
 
 
 Command.prototype.subcommands.tiddlers = function() {
-	var tiddlers = this.commander.wiki.sortTiddlers()
+	var tiddlers = this.commander.wiki.sortTiddlers();
 	this.output.write("Wiki contains these tiddlers:\n");
 	for(var t=0; t<tiddlers.length; t++) {
 		this.output.write(tiddlers[t] + "\n");
@@ -47,7 +48,7 @@ Command.prototype.subcommands.tiddlers = function() {
 };
 
 Command.prototype.subcommands.shadows = function() {
-	var tiddlers = this.commander.wiki.shadows.sortTiddlers()
+	var tiddlers = this.commander.wiki.shadows.sortTiddlers();
 	this.output.write("Wiki contains these shadow tiddlers:\n");
 	for(var t=0; t<tiddlers.length; t++) {
 		this.output.write(tiddlers[t] + "\n");
diff --git a/rabbithole/core/modules/commands/load.js b/rabbithole/core/modules/commands/load.js
index 6da8a16f4..2aae4a7f9 100644
--- a/rabbithole/core/modules/commands/load.js
+++ b/rabbithole/core/modules/commands/load.js
@@ -9,6 +9,7 @@ Load tiddlers command
 (function(){
 
 /*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.info = {
diff --git a/rabbithole/core/modules/commands/savetiddler.js b/rabbithole/core/modules/commands/savetiddler.js
index 27b06b004..424653eaf 100644
--- a/rabbithole/core/modules/commands/savetiddler.js
+++ b/rabbithole/core/modules/commands/savetiddler.js
@@ -9,6 +9,7 @@ Save tiddlers command
 (function(){
 
 /*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.info = {
diff --git a/rabbithole/core/modules/commands/verbose.js b/rabbithole/core/modules/commands/verbose.js
index 987d9ac12..eb2d7a405 100644
--- a/rabbithole/core/modules/commands/verbose.js
+++ b/rabbithole/core/modules/commands/verbose.js
@@ -9,12 +9,13 @@ Verbose command
 (function(){
 
 /*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.info = {
 	name: "verbose",
 	synchronous: true
-}
+};
 
 var Command = function(params,commander) {
 	this.params = params;
@@ -24,7 +25,7 @@ var Command = function(params,commander) {
 Command.prototype.execute = function() {
 	this.commander.verbose = true;
 	return null; // No error
-}
+};
 
 exports.Command = Command;
 
diff --git a/rabbithole/core/modules/commands/version.js b/rabbithole/core/modules/commands/version.js
index 4467c69bc..7be0d6a6f 100644
--- a/rabbithole/core/modules/commands/version.js
+++ b/rabbithole/core/modules/commands/version.js
@@ -9,12 +9,13 @@ Version command
 (function(){
 
 /*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.info = {
 	name: "version",
 	synchronous: true
-}
+};
 
 var Command = function(params,commander) {
 	this.params = params;
@@ -24,7 +25,7 @@ var Command = function(params,commander) {
 Command.prototype.execute = function() {
 	this.commander.streams.output.write($tw.utils.getVersionString() + "\n");
 	return null; // No error
-}
+};
 
 exports.Command = Command;
 
diff --git a/rabbithole/core/modules/commands/wikitest.js b/rabbithole/core/modules/commands/wikitest.js
index b8d7878de..5b39db4fe 100644
--- a/rabbithole/core/modules/commands/wikitest.js
+++ b/rabbithole/core/modules/commands/wikitest.js
@@ -9,6 +9,7 @@ wikitest command
 (function(){
 
 /*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.info = {
diff --git a/rabbithole/core/modules/config.js b/rabbithole/core/modules/config.js
index 72c7cb710..0d28c1712 100644
--- a/rabbithole/core/modules/config.js
+++ b/rabbithole/core/modules/config.js
@@ -8,7 +8,8 @@ Core configuration constants
 \*/
 (function(){
 
-/*jslint node: true */
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.dateFormats = {
diff --git a/rabbithole/core/modules/dependencies.js b/rabbithole/core/modules/dependencies.js
index fcbf50ca3..6f064dbfd 100644
--- a/rabbithole/core/modules/dependencies.js
+++ b/rabbithole/core/modules/dependencies.js
@@ -12,7 +12,8 @@ Represents the dependencies of a tiddler or a parser node as these fields:
 \*/
 (function(){
 
-/*jslint node: true */
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 var Dependencies = function(skinnyTiddlers,fatTiddlers,dependentAll) {
diff --git a/rabbithole/core/modules/deserializers.js b/rabbithole/core/modules/deserializers.js
index a880330bf..d017bc971 100644
--- a/rabbithole/core/modules/deserializers.js
+++ b/rabbithole/core/modules/deserializers.js
@@ -12,7 +12,8 @@ Represents the dependencies of a tiddler or a parser node as these fields:
 \*/
 (function(){
 
-/*jslint node: true */
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports["text/plain"] = function(text,fields) {
diff --git a/rabbithole/core/modules/macros/button.js b/rabbithole/core/modules/macros/button.js
index 163605e95..ac490fba5 100644
--- a/rabbithole/core/modules/macros/button.js
+++ b/rabbithole/core/modules/macros/button.js
@@ -7,6 +7,7 @@ module-type: macro
 (function(){
 
 /*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.info = {
diff --git a/rabbithole/core/modules/macros/chooser.js b/rabbithole/core/modules/macros/chooser.js
index 6eb06cdad..fcfab7d46 100644
--- a/rabbithole/core/modules/macros/chooser.js
+++ b/rabbithole/core/modules/macros/chooser.js
@@ -7,6 +7,7 @@ module-type: macro
 (function(){
 
 /*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.info = {
@@ -48,14 +49,14 @@ exports.select = function(y) {
 			$tw.utils.addClass(target,"selected");
 		}
 	}
-}
+};
 
 exports.deselect = function() {
 	if(this.selectedNode) {
 		$tw.utils.removeClass(this.selectedNode,"selected");
 		this.selectedNode = null;
 	}
-}
+};
 
 exports.action = function() {
 	if(this.selectedNode) {
@@ -64,7 +65,7 @@ exports.action = function() {
 		navEvent.navigateTo = this.selectedNode.getAttribute("data-link");
 		this.domNode.dispatchEvent(navEvent); 
 	}
-}
+};
 
 /*
 Set the position of the chooser panel within its wrapper given a touch/mouse position in screen coordinates
@@ -92,7 +93,7 @@ exports.hoverChooser = function(x,y) {
 		domPanel.style.webkitTransform = 
 		domPanel.style.MozTransform = "scale(" + scale + ") translateX(" + translateX + "px) translateY(" + translateY + "px)";
 	}
-}
+};
 
 exports.hideChooser = function() {
 	if(this.chooserDisplayed) {
@@ -101,7 +102,7 @@ exports.hideChooser = function() {
 		this.domNode.removeChild(this.children[0].domNode);
 		this.children = [];
 	}
-}
+};
 
 exports.handleEvent = function(event) {
 	switch(event.type) {
diff --git a/rabbithole/core/modules/macros/echo.js b/rabbithole/core/modules/macros/echo.js
index 285fb9e9d..2ebdc090e 100644
--- a/rabbithole/core/modules/macros/echo.js
+++ b/rabbithole/core/modules/macros/echo.js
@@ -6,7 +6,8 @@ module-type: macro
 \*/
 (function(){
 
-/*jslint node: true */
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.info = {
diff --git a/rabbithole/core/modules/macros/edit/edit.js b/rabbithole/core/modules/macros/edit/edit.js
index fab91b9da..e877db2c2 100644
--- a/rabbithole/core/modules/macros/edit/edit.js
+++ b/rabbithole/core/modules/macros/edit/edit.js
@@ -7,6 +7,7 @@ module-type: macro
 (function(){
 
 /*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.info = {
diff --git a/rabbithole/core/modules/macros/edit/editors/bitmapeditor.js b/rabbithole/core/modules/macros/edit/editors/bitmapeditor.js
index fb2505b43..10bec98e0 100644
--- a/rabbithole/core/modules/macros/edit/editors/bitmapeditor.js
+++ b/rabbithole/core/modules/macros/edit/editors/bitmapeditor.js
@@ -7,6 +7,7 @@ module-type: editor
 (function(){
 
 /*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 function BitmapEditor(macroNode) {
diff --git a/rabbithole/core/modules/macros/edit/editors/texteditor.js b/rabbithole/core/modules/macros/edit/editors/texteditor.js
index 8875dd29f..8cfacda30 100644
--- a/rabbithole/core/modules/macros/edit/editors/texteditor.js
+++ b/rabbithole/core/modules/macros/edit/editors/texteditor.js
@@ -7,6 +7,7 @@ module-type: editor
 (function(){
 
 /*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 function TextEditor(macroNode) {
diff --git a/rabbithole/core/modules/macros/image.js b/rabbithole/core/modules/macros/image.js
index 73c6f7b74..0b04e148f 100644
--- a/rabbithole/core/modules/macros/image.js
+++ b/rabbithole/core/modules/macros/image.js
@@ -6,7 +6,8 @@ module-type: macro
 \*/
 (function(){
 
-/*jslint node: true */
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.info = {
diff --git a/rabbithole/core/modules/macros/link.js b/rabbithole/core/modules/macros/link.js
index 4d2731ae0..90460814e 100644
--- a/rabbithole/core/modules/macros/link.js
+++ b/rabbithole/core/modules/macros/link.js
@@ -9,6 +9,7 @@ Implements the link macro.
 (function(){
 
 /*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 var isLinkExternal = function(to) {
diff --git a/rabbithole/core/modules/macros/list.js b/rabbithole/core/modules/macros/list.js
index a9af76d40..a1b06c1f5 100644
--- a/rabbithole/core/modules/macros/list.js
+++ b/rabbithole/core/modules/macros/list.js
@@ -6,7 +6,8 @@ module-type: macro
 \*/
 (function(){
 
-/*jslint node: true */
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 var handlers = {
diff --git a/rabbithole/core/modules/macros/slider.js b/rabbithole/core/modules/macros/slider.js
index 126204d58..11d029df7 100644
--- a/rabbithole/core/modules/macros/slider.js
+++ b/rabbithole/core/modules/macros/slider.js
@@ -35,7 +35,8 @@ The slider is a good study example of a simple interactive macro.
 \*/
 (function(){
 
-/*jslint node: true */
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.info = {
diff --git a/rabbithole/core/modules/macros/story.js b/rabbithole/core/modules/macros/story.js
index 211254103..55998e853 100644
--- a/rabbithole/core/modules/macros/story.js
+++ b/rabbithole/core/modules/macros/story.js
@@ -6,7 +6,8 @@ module-type: macro
 \*/
 (function(){
 
-/*jslint node: true, jquery: true, browser: true */
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 function scrollToTop(duration) {
@@ -30,9 +31,8 @@ exports.info = {
 	events: ["tw-navigate","tw-EditTiddler","tw-SaveTiddler"]
 };
 
-
 exports.handleEvent = function(event) {
-	var template, storyTiddler, story, storyRecord, tiddler, storyTiddlerModified;
+	var template, storyTiddler, story, storyRecord, tiddler, storyTiddlerModified, t;
 	switch(event.type) {
 		case "tw-navigate":
 			// Navigate to a specified tiddler
@@ -55,12 +55,12 @@ exports.handleEvent = function(event) {
 			if(storyTiddler && storyTiddler.fields.hasOwnProperty("text")) {
 				story = JSON.parse(storyTiddler.fields.text);
 			}
-			for(var t=0; t<story.tiddlers.length; t++) {
-				var storyRecord = story.tiddlers[t];
+			for(t=0; t<story.tiddlers.length; t++) {
+				storyRecord = story.tiddlers[t];
 				if(storyRecord.title === event.tiddlerTitle && storyRecord.template !== template) {
 					storyRecord.title = "Draft " + (new Date()) + " of " + event.tiddlerTitle;
 					storyRecord.template = template;
-					var tiddler = this.wiki.getTiddler(event.tiddlerTitle);
+					tiddler = this.wiki.getTiddler(event.tiddlerTitle);
 					this.wiki.addTiddler(new $tw.Tiddler(
 						{
 							text: "Type the text for the tiddler '" + event.tiddlerTitle + "'"
@@ -84,10 +84,10 @@ exports.handleEvent = function(event) {
 			if(storyTiddler && storyTiddler.fields.hasOwnProperty("text")) {
 				story = JSON.parse(storyTiddler.fields.text);
 			}
-			for(var t=0; t<story.tiddlers.length; t++) {
-				var storyRecord = story.tiddlers[t];
+			for(t=0; t<story.tiddlers.length; t++) {
+				storyRecord = story.tiddlers[t];
 				if(storyRecord.title === event.tiddlerTitle && storyRecord.template !== template) {
-					var tiddler = this.wiki.getTiddler(storyRecord.title);
+					tiddler = this.wiki.getTiddler(storyRecord.title);
 					if(tiddler && tiddler.fields.hasOwnProperty("draft.title")) {
 						// Save the draft tiddler as the real tiddler
 						this.wiki.addTiddler(new $tw.Tiddler(tiddler,{title: tiddler.fields["draft.title"],"draft.title": undefined, "draft.of": undefined}));
diff --git a/rabbithole/core/modules/macros/tiddler.js b/rabbithole/core/modules/macros/tiddler.js
index 226b8b1ac..d33b8dbf7 100644
--- a/rabbithole/core/modules/macros/tiddler.js
+++ b/rabbithole/core/modules/macros/tiddler.js
@@ -41,7 +41,8 @@ the `template` parameter or, if that parameter is missing, the tiddler named in
 \*/
 (function(){
 
-/*jslint node: true */
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.info = {
@@ -66,7 +67,7 @@ exports.evaluateDependencies = function() {
 		dependencies.addDependency(template,true);
 	}
 	return dependencies;
-}
+};
 
 exports.executeMacro = function() {
 	var renderTitle = this.params.target,
@@ -124,7 +125,7 @@ exports.executeMacro = function() {
 	}
 	// Return the children
 	return [$tw.Tree.Element("div",attributes,childrenClone)];
-}
+};
 
 exports.refreshInDom = function(changes) {
 	var t;
diff --git a/rabbithole/core/modules/macros/version.js b/rabbithole/core/modules/macros/version.js
index 7f05329b1..51f4b90c4 100644
--- a/rabbithole/core/modules/macros/version.js
+++ b/rabbithole/core/modules/macros/version.js
@@ -6,14 +6,15 @@ module-type: macro
 \*/
 (function(){
 
-/*jslint node: true */
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.info = {
 	name: "version",
 	params: {
 	}
-}
+};
 
 exports.executeMacro = function() {
 	return [$tw.Tree.Text($tw.utils.getVersionString())];
diff --git a/rabbithole/core/modules/macros/video.js b/rabbithole/core/modules/macros/video.js
index 2161cd5ee..840a9692b 100644
--- a/rabbithole/core/modules/macros/video.js
+++ b/rabbithole/core/modules/macros/video.js
@@ -6,7 +6,8 @@ module-type: macro
 \*/
 (function(){
 
-/*jslint node: true */
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.info = {
diff --git a/rabbithole/core/modules/macros/view.js b/rabbithole/core/modules/macros/view.js
index 6bcb5f134..61e0c7d52 100644
--- a/rabbithole/core/modules/macros/view.js
+++ b/rabbithole/core/modules/macros/view.js
@@ -6,7 +6,8 @@ module-type: macro
 \*/
 (function(){
 
-/*jslint node: true */
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.info = {
diff --git a/rabbithole/core/modules/macros/zoomer.js b/rabbithole/core/modules/macros/zoomer.js
index 73bb91538..5ff056cc0 100644
--- a/rabbithole/core/modules/macros/zoomer.js
+++ b/rabbithole/core/modules/macros/zoomer.js
@@ -7,6 +7,7 @@ module-type: macro
 (function(){
 
 /*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.info = {
@@ -22,7 +23,7 @@ exports.startZoomer = function(x,y) {
 	this.startX = x;
 	this.startY = y;
 	$tw.utils.addClass(document.body,"in-zoomer");
-}
+};
 
 exports.stopZoomer = function() {
 	var newScrollY = this.yFactor * (this.bodyHeight - this.windowHeight);
@@ -33,7 +34,7 @@ exports.stopZoomer = function() {
 		"translateY(" + ((this.windowHeight / this.scale) - this.bodyHeight) * this.yFactor * this.xFactor + "px)";
 	$tw.utils.removeClass(document.body,"in-zoomer");
 	document.body.style.webkitTransform = "translateY(0) scale(1) translateY(0)";
-}
+};
 
 /*
 Zoom the body element given a touch/mouse position in screen coordinates
diff --git a/rabbithole/core/modules/parsers/imageparser.js b/rabbithole/core/modules/parsers/imageparser.js
index 01aa2aa18..9e1c5924b 100644
--- a/rabbithole/core/modules/parsers/imageparser.js
+++ b/rabbithole/core/modules/parsers/imageparser.js
@@ -8,7 +8,8 @@ Parses an image into a parse tree containing an HTML img element
 \*/
 (function(){
 
-/*jslint node: true */
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 var ImageParser = function(options) {
diff --git a/rabbithole/core/modules/parsers/jsonparser.js b/rabbithole/core/modules/parsers/jsonparser.js
index e9388fa79..711008f6f 100644
--- a/rabbithole/core/modules/parsers/jsonparser.js
+++ b/rabbithole/core/modules/parsers/jsonparser.js
@@ -8,7 +8,8 @@ Parses a JSON object into a parse tree
 \*/
 (function(){
 
-/*jslint node: true */
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 var renderObject = function(obj) {
@@ -41,7 +42,7 @@ var JSONParser = function(options) {
 };
 
 JSONParser.prototype.parse = function(type,text) {
-	return new $tw.Renderer([renderObject(JSON.parse(text))],new Dependencies());
+	return new $tw.Renderer([renderObject(JSON.parse(text))],new $tw.Dependencies());
 };
 
 exports["application/json"] = JSONParser;
diff --git a/rabbithole/core/modules/parsers/plaintextparser.js b/rabbithole/core/modules/parsers/plaintextparser.js
index 44bb74858..42b045023 100644
--- a/rabbithole/core/modules/parsers/plaintextparser.js
+++ b/rabbithole/core/modules/parsers/plaintextparser.js
@@ -8,7 +8,8 @@ Renders plain text tiddlers
 \*/
 (function(){
 
-/*jslint node: true */
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 var PlainTextParser = function(options) {
diff --git a/rabbithole/core/modules/parsers/tiddlytextparser.js b/rabbithole/core/modules/parsers/tiddlytextparser.js
index 71c0502e0..c2fa8cd48 100644
--- a/rabbithole/core/modules/parsers/tiddlytextparser.js
+++ b/rabbithole/core/modules/parsers/tiddlytextparser.js
@@ -16,7 +16,8 @@ The syntax for macros is:
 \*/
 (function(){
 
-/*jslint node: true */
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 var TiddlyTextParser = function(options) {
diff --git a/rabbithole/core/modules/parsers/wikitextparser/rules/wikitextrules.js b/rabbithole/core/modules/parsers/wikitextparser/rules/wikitextrules.js
index 1102d2a2b..69887aaac 100755
--- a/rabbithole/core/modules/parsers/wikitextparser/rules/wikitextrules.js
+++ b/rabbithole/core/modules/parsers/wikitextparser/rules/wikitextrules.js
@@ -6,7 +6,8 @@ module-type: wikitextrule
 \*/
 (function(){
 
-/*jslint node: true */
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 var textPrimitives = {
diff --git a/rabbithole/core/modules/parsers/wikitextparser/wikitextparser.js b/rabbithole/core/modules/parsers/wikitextparser/wikitextparser.js
index 57af67322..de9c141aa 100644
--- a/rabbithole/core/modules/parsers/wikitextparser/wikitextparser.js
+++ b/rabbithole/core/modules/parsers/wikitextparser/wikitextparser.js
@@ -30,7 +30,8 @@ HTML nodes look like this:
 \*/
 (function(){
 
-/*jslint node: true */
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 /*
diff --git a/rabbithole/core/modules/renderer.js b/rabbithole/core/modules/renderer.js
index 3cc273e87..98fbe0800 100644
--- a/rabbithole/core/modules/renderer.js
+++ b/rabbithole/core/modules/renderer.js
@@ -8,7 +8,8 @@ Represents a parse tree and associated data
 \*/
 (function(){
 
-/*jslint node: true */
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 var Renderer = function(tree,dependencies) {
diff --git a/rabbithole/core/modules/startup.js b/rabbithole/core/modules/startup.js
index e7b108583..3e3c9d9a4 100644
--- a/rabbithole/core/modules/startup.js
+++ b/rabbithole/core/modules/startup.js
@@ -9,6 +9,7 @@ This is the main application logic for both the client and server
 (function(){
 
 /*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.startup = function() {
@@ -56,6 +57,6 @@ if($tw.isBrowser) {
 	commander.execute();
 }
 
-}
+};
 
 })();
diff --git a/rabbithole/core/modules/tiddler.js b/rabbithole/core/modules/tiddler.js
index 003cebc4d..fa0f745ce 100644
--- a/rabbithole/core/modules/tiddler.js
+++ b/rabbithole/core/modules/tiddler.js
@@ -8,7 +8,8 @@ Extension methods for the $tw.Tiddler object
 \*/
 (function(){
 
-/*jslint node: true */
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.hasTag = function(tag) {
diff --git a/rabbithole/core/modules/tree.js b/rabbithole/core/modules/tree.js
index 0780059b4..d5b0bda7d 100644
--- a/rabbithole/core/modules/tree.js
+++ b/rabbithole/core/modules/tree.js
@@ -19,7 +19,8 @@ themselves with `new` when required.
 \*/
 (function(){
 
-/*jshint node: true, browser: true */
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.Tree = {};
diff --git a/rabbithole/core/modules/tree.utils.js b/rabbithole/core/modules/tree.utils.js
index 30cf34a64..5b6e2e921 100644
--- a/rabbithole/core/modules/tree.utils.js
+++ b/rabbithole/core/modules/tree.utils.js
@@ -8,7 +8,8 @@ Static utility methods for the $tw.Tree class
 \*/
 (function(){
 
-/*jshint node: true, browser: true */
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 /*
@@ -18,7 +19,7 @@ exports.errorNode = function(text) {
 	return $tw.Tree.Element("span",{
 		"class": ["label","label-important"]
 	},[
-		new TextNode(text)
+		new $tw.Tree.Text(text)
 	]);
 };
 
diff --git a/rabbithole/core/modules/treenodes/element.js b/rabbithole/core/modules/treenodes/element.js
index 77b860e6d..0791587cc 100644
--- a/rabbithole/core/modules/treenodes/element.js
+++ b/rabbithole/core/modules/treenodes/element.js
@@ -8,7 +8,8 @@ Element nodes
 \*/
 (function(){
 
-/*jshint node: true, browser: true */
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 var Node = require("./node.js").Node;
diff --git a/rabbithole/core/modules/treenodes/entity.js b/rabbithole/core/modules/treenodes/entity.js
index 5a371875d..8ca214799 100644
--- a/rabbithole/core/modules/treenodes/entity.js
+++ b/rabbithole/core/modules/treenodes/entity.js
@@ -8,7 +8,8 @@ Entity nodes
 \*/
 (function(){
 
-/*jshint node: true, browser: true */
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 var Node = require("./node.js").Node;
diff --git a/rabbithole/core/modules/treenodes/macro.js b/rabbithole/core/modules/treenodes/macro.js
index a699bef3d..4e841a76d 100644
--- a/rabbithole/core/modules/treenodes/macro.js
+++ b/rabbithole/core/modules/treenodes/macro.js
@@ -9,6 +9,7 @@ Macro node, used as the base class for macros
 (function(){
 
 /*jshint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 var Node = require("./node.js").Node;
@@ -46,8 +47,7 @@ var Macro = function(macroName,srcParams,content,wiki,dependencies) {
 			this.info = MacroClass.prototype.info;
 		}
 	} else {
-		// If Macro() has been called without new then lookup the macro class to instantiate
-		var MacroClass = wiki.macros[macroName];
+		// If Macro() has been called without 'new' then instantiate the right macro class
 		return new MacroClass(macroName,srcParams,content,wiki,dependencies);
 	}
 };
@@ -123,7 +123,7 @@ Macro.prototype.cloneContent = function() {
 		contentClones.push(this.content[t].clone());
 	}
 	return contentClones;
-}
+};
 
 Macro.prototype.clone = function() {
 	return new this.MacroClass(this.macroName,this.srcParams,this.cloneContent(),this.wiki,this.dependencies);
diff --git a/rabbithole/core/modules/treenodes/node.js b/rabbithole/core/modules/treenodes/node.js
index 060cc9e57..75c4e5c55 100644
--- a/rabbithole/core/modules/treenodes/node.js
+++ b/rabbithole/core/modules/treenodes/node.js
@@ -8,7 +8,8 @@ Base class for all other tree nodes
 \*/
 (function(){
 
-/*jshint node: true, browser: true */
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 /*
diff --git a/rabbithole/core/modules/treenodes/raw.js b/rabbithole/core/modules/treenodes/raw.js
index 3a3b1f720..f80eef6b3 100644
--- a/rabbithole/core/modules/treenodes/raw.js
+++ b/rabbithole/core/modules/treenodes/raw.js
@@ -8,7 +8,8 @@ Raw, unparsed HTML nodes
 \*/
 (function(){
 
-/*jshint node: true, browser: true */
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 var Node = require("./node.js").Node;
diff --git a/rabbithole/core/modules/treenodes/text.js b/rabbithole/core/modules/treenodes/text.js
index 8a97105c0..e7021551c 100644
--- a/rabbithole/core/modules/treenodes/text.js
+++ b/rabbithole/core/modules/treenodes/text.js
@@ -8,7 +8,8 @@ Text nodes
 \*/
 (function(){
 
-/*jshint node: true, browser: true */
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 var Node = require("./node.js").Node;
diff --git a/rabbithole/core/modules/utils.argparser.js b/rabbithole/core/modules/utils.argparser.js
index c37cbf88b..e8f320769 100644
--- a/rabbithole/core/modules/utils.argparser.js
+++ b/rabbithole/core/modules/utils.argparser.js
@@ -23,7 +23,8 @@ Options and their defaults are:
 \*/
 (function(){
 
-/*jslint node: true */
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 var ArgParser = function(argString,options) {
diff --git a/rabbithole/core/modules/utils.js b/rabbithole/core/modules/utils.js
index d72f7ad76..ebaa44803 100644
--- a/rabbithole/core/modules/utils.js
+++ b/rabbithole/core/modules/utils.js
@@ -10,7 +10,8 @@ This file is a bit of a dumping ground; the expectation is that most of these fu
 \*/
 (function(){
 
-/*jslint node: true */
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.deepCopy = function(object) {
@@ -33,7 +34,7 @@ exports.deepCopy = function(object) {
 
 exports.extendDeepCopy = function(object,extendedProperties) {
 	var result = $tw.utils.deepCopy(object),t;
-	for(var t in extendedProperties) {
+	for(t in extendedProperties) {
 		if(object[t] !== undefined) {
 			result[t] = $tw.utils.deepCopy(object[t]);
 		}
diff --git a/rabbithole/core/modules/wiki.js b/rabbithole/core/modules/wiki.js
index 2ecc747b7..49c099dbd 100644
--- a/rabbithole/core/modules/wiki.js
+++ b/rabbithole/core/modules/wiki.js
@@ -21,7 +21,8 @@ last dispatched. Each entry is a hashmap containing two fields:
 \*/
 (function(){
 
-/*jslint node: true */
+/*jslint node: true, browser: true */
+/*global $tw: false */
 "use strict";
 
 exports.getTiddlerText = function(title,defaultText) {
@@ -124,7 +125,7 @@ exports.sortTiddlers = function(sortField,excludeTag) {
 	sortField = sortField || "title";
 	var tiddlers = [], t, titles = [];
 	for(t in this.tiddlers) {
-		tiddlers.push(this.tiddlers[t])
+		tiddlers.push(this.tiddlers[t]);
 	}
 	tiddlers.sort(function(a,b) {
 		var aa = a.fields[sortField] || 0,
diff --git a/rabbithole/tw5.com/run.sh b/rabbithole/tw5.com/run.sh
index c104a277d..bd08dca3d 100755
--- a/rabbithole/tw5.com/run.sh
+++ b/rabbithole/tw5.com/run.sh
@@ -3,3 +3,15 @@
 # run TiddlyWiki5
 
 node ../core/boot.js --verbose --wikitest ../../test/wikitests/ --dump shadows || exit 1
+
+# run jshint
+jshint ../core/*.js
+jshint ../core/modules/*.js
+jshint ../core/modules/commands/*.js
+jshint ../core/modules/macros/*.js
+jshint ../core/modules/macros/edit/*.js
+jshint ../core/modules/macros/edit/editors/*.js
+jshint ../core/modules/parsers/*.js
+jshint ../core/modules/parsers/wikitextparser/*.js
+jshint ../core/modules/parsers/wikitextparser/rules/*.js
+jshint ../core/modules/treenodes/*.js