diff --git a/Makefile b/Makefile
index 264614f6..54312a73 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,5 @@
+.PHONY : doc build clean dist
+
 build:
 	git rev-parse HEAD > .git-ref
 	mkdir -p build/src
@@ -12,7 +14,6 @@ build:
 	./Makefile.dryice.js demo
 	./Makefile.dryice.js bm
 
- .PHONY : doc
 doc:
 	cd doc; node build.js
 
diff --git a/doc/README.md b/doc/README.md
index 968600df..b49ec651 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -2,14 +2,10 @@
 
 The beginnings of an API documentation set for Ace. 
 
-This documentation can't be build without [C9's version of ndoc](https://github.com/c9/ndoc), so you should clone that repo somewhere, too. Note to self: since there's a billion people following this project, should I just make this ndoc a submodule, similair to NodeManual? I'd rather not.
-
 # Building
 
 In this directory, just run 
 
     node build.js [path_to_ndoc]
 
-`[path_to_ndoc]` is a required argument, indicating the location of your ndoc install, relative to the `build.js` file. By default, this will point to `./build/ndoc/bin/ndoc`. 
-
-Right now, yes, we're using the [NodeManual.org](http://www.nodemanual.org) theme. A real style is pending. Also there are a lot of *TODO* items so you should really be more concerned about that.
\ No newline at end of file
+`[path_to_ndoc]` is a required argument, indicating the location of your ndoc install, relative to the `build.js` file. By default, this will point to `./build/ndoc/bin/ndoc`. 
\ No newline at end of file
diff --git a/doc/additionalObjs.json b/doc/additionalObjs.json
index 16545df7..6eb756a2 100644
--- a/doc/additionalObjs.json
+++ b/doc/additionalObjs.json
@@ -1,7 +1,7 @@
 {
-	"DOMElement"  : "https://developer.mozilla.org/en/DOM/element",
-	"Event"    : "https://github.com/ajaxorg/ace/blob/master/lib/ace/lib/event.js",
-	"TextMode" : "https://github.com/ajaxorg/ace/blob/master/lib/ace/mode/text.js",
-	"KeyBinding" : "https://github.com/ajaxorg/ace/blob/master/lib/ace/keyboard/keybinding.js",
-	"Cursor" : "https://github.com/ajaxorg/ace/blob/master/lib/ace/layer/cursor.js"
+    "DOMElement": "https://developer.mozilla.org/en/DOM/element",
+    "Event": "https://github.com/ajaxorg/ace/blob/master/lib/ace/lib/event.js",
+    "TextMode": "https://github.com/ajaxorg/ace/blob/master/lib/ace/mode/text.js",
+    "KeyBinding": "https://github.com/ajaxorg/ace/blob/master/lib/ace/keyboard/keybinding.js",
+    "Cursor": "https://github.com/ajaxorg/ace/blob/master/lib/ace/layer/cursor.js"
 }
\ No newline at end of file
diff --git a/doc/package.json b/doc/package.json
deleted file mode 100644
index 89639d2c..00000000
--- a/doc/package.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "name": "ace_docs",
-  "version": "0.0.1",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/ajaxorg/ace.git"
-  },
-  "engines": {
-    "node": "~0.6.0"
-  },
-  "dependencies": {
-    "panino" : "~1.0.12"
-  },
-  "devDependencies": {}
-}
\ No newline at end of file
diff --git a/package.json b/package.json
index 513cecb3..22f51177 100644
--- a/package.json
+++ b/package.json
@@ -18,18 +18,19 @@
         "jsdom": "0.2.x",
         "amd-loader": "~0.0.4",
         "libxml": "0.0.x",
-        "dryice": "0.4.2"
+        "dryice": "0.4.2",
+        "panino" : "~1.0.12"
+    },
+    "engines": {
+      "node": "~0.6.0"
     },
-
     "licenses": [{
         "type": "MPL",
         "url": "http://www.mozilla.org/MPL/"
-    },
-    {
+    }, {
         "type": "GPL",
         "url": "http://www.gnu.org/licenses/gpl.html"
-    },
-    {
+    }, {
         "type": "LGPL",
         "url": "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html"
     }],