diff --git a/.gitignore b/.gitignore
index 75419dc2..55190216 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,4 +29,5 @@ selection.json
 # runtime junk
 npm-debug.log
 /examples/*/public
-/megadoc.sublime-workspace
\ No newline at end of file
+/megadoc.sublime-workspace
+/.local
diff --git a/doc/megadoc.conf.js b/doc/megadoc.conf.js
index a0841903..ee543d7a 100644
--- a/doc/megadoc.conf.js
+++ b/doc/megadoc.conf.js
@@ -162,7 +162,7 @@ config.plugins = [
       'ui/**/*.js',
     ],
 
-    exclude: [ /test/, /vendor/, ],
+    exclude: [ /__tests__/, /vendor/, ],
 
     useDirAsNamespace: false,
 
diff --git a/karma.main.js b/karma.main.js
index 0fb9eed3..a0f8c185 100644
--- a/karma.main.js
+++ b/karma.main.js
@@ -9,14 +9,18 @@ require('./ui');
 
 sinon.assert.expose(chai.assert, { prefix: "" });
 
-const CoreUITests = require.context('./ui', true, /.test.js$/);
-
-CoreUITests.keys().forEach(CoreUITests);
+tap(require.context('./ui', true, /.test.js$/), function(x) {
+  x.keys().forEach(x);
+});
 
 tap(require.context('./packages/megadoc-plugin-markdown/ui', true, /.test.js$/), function(x) {
   x.keys().forEach(x);
 });
 
+tap(require.context('./packages/megadoc-plugin-js/ui', true, /.test.js$/), function(x) {
+  x.keys().forEach(x);
+});
+
 it('gives us something', function() {
   chai.assert.ok(true);
 });
diff --git a/lib/HTMLSerializer__LinkResolver.js b/lib/HTMLSerializer__LinkResolver.js
index a7711cac..50ecd34e 100644
--- a/lib/HTMLSerializer__LinkResolver.js
+++ b/lib/HTMLSerializer__LinkResolver.js
@@ -1,6 +1,7 @@
 var assert = require('assert');
 var EventEmitter = require('events').EventEmitter;
 var URI = require('urijs');
+var dumpNodeFilePath = require('megadoc-corpus').Corpus.dumpNodeFilePath;
 
 /**
  * @param {Corpus} corpus
@@ -44,10 +45,15 @@ LinkResolver.prototype.lookup = function(params) {
   assert(typeof params.path === 'string',
     "A lookup requires at least a @path to be specified.");
 
+  if (params.path.length === 0) {
+    console.warn("Link seems to be empty... Source:", dumpNodeFilePath(params.contextNode));
+    return;
+  }
+
   if (process.env.VERBOSE) {
     console.log('Resolving link to "%s" from "%s"...',
       params.path,
-      params.contextNode ? params.contextNode.uid : '<<unknown>>'
+      dumpNodeFilePath(params.contextNode)
     );
   }
 
diff --git a/lib/Renderer__renderCode.js b/lib/Renderer__renderCode.js
index 3f0c83c0..e60096f6 100644
--- a/lib/Renderer__renderCode.js
+++ b/lib/Renderer__renderCode.js
@@ -3,6 +3,7 @@ var assign = require('lodash').assign;
 
 function CodeRenderer(userConfig) {
   var config = assign({
+    defaultLanguage: null,
     languages: [],
     aliases: {}
   }, userConfig);
@@ -19,7 +20,7 @@ function CodeRenderer(userConfig) {
   });
 
   return function renderCode(code, language) {
-    var languageCode = config.aliases[language] || language;
+    var languageCode = config.aliases[language] || language || config.defaultLanguage;
     var grammar = Prism.languages[languageCode];
     var html = code;
 
diff --git a/lib/Renderer__renderHeading.js b/lib/Renderer__renderHeading.js
index 7ee21fc8..b174c06a 100644
--- a/lib/Renderer__renderHeading.js
+++ b/lib/Renderer__renderHeading.js
@@ -26,6 +26,10 @@ function renderHeading(text, level, state, runOptions) {
 
   var id = state.baseURL ? joinBySlash(state.baseURL, scopedId) : scopedId;
 
+  if (state.toc.some(function(x) { return x.scopedId === scopedId; })) {
+    scopedId = level + scopedId;
+  }
+
   // TODO: gief a markdown analyzer, really...
   state.toc.push({
     id: id,
diff --git a/lib/config.js b/lib/config.js
index 8c6e11d0..5a1f4f45 100644
--- a/lib/config.js
+++ b/lib/config.js
@@ -266,6 +266,8 @@ module.exports = {
    * [Prism.js](http://prismjs.com/).
    */
   syntaxHighlighting: {
+    defaultLanguage: 'javascript',
+
     /**
      * @property {Array.<String>} syntaxHighlighting.languages
      *
diff --git a/package.json b/package.json
index 289ae1aa..a1018eb2 100644
--- a/package.json
+++ b/package.json
@@ -32,9 +32,9 @@
   "homepage": "https://github.com/megadoc/megadoc",
   "dependencies": {
     "async": "^2.0.0-rc.3",
-    "babel-core": "6.7.6",
+    "babel-core": "6.9.0",
     "babel-loader": "6.2.4",
-    "babel-preset-es2015": "6.6.0",
+    "babel-preset-es2015": "6.9.0",
     "babel-preset-react": "6.5.0",
     "classnames": "^2.1.5",
     "commander": "^2.8.1",
@@ -82,7 +82,7 @@
     "karma-mocha": "0.1.10",
     "karma-sourcemap-loader": "0.3.3",
     "karma-webpack": "1.7.0",
-    "mocha": "^2.3.3",
+    "mocha": "2.4.5",
     "mocha-lcov-reporter": "^1.0.0",
     "react-drill": "2.1.1",
     "react-hot-loader": "1.3.0",
diff --git a/packages/megadoc-corpus/defs/core.js b/packages/megadoc-corpus/defs/core.js
index fc008e62..d58e6b30 100644
--- a/packages/megadoc-corpus/defs/core.js
+++ b/packages/megadoc-corpus/defs/core.js
@@ -30,7 +30,6 @@ var t = CorpusTypes.builtInTypes;
  * });
  * ```
  */
-var exports;
 
 /**
  * @module T.Corpus
@@ -73,7 +72,7 @@ def("Corpus", {
 def("Namespace", {
   fields: {
     /**
-     * @property {String}
+     * @property {!String}
      *
      * An identifier for this namespace that must be unique at this level in the
      * corpus. The identifier is utilized in the generation of [CorpusUIDs UIDs]()
@@ -83,7 +82,7 @@ def("Namespace", {
     id: t.string,
 
     /**
-     * @property {String}
+     * @property {!String}
      *
      * A name to be used internally for the namespace. This property is meant to
      * identify the "class" of the namespace; or in other words, the type of
@@ -99,7 +98,7 @@ def("Namespace", {
     name: t.string,
 
     /**
-     * @property {String} [title=null]
+     * @property {String?} [title=null]
      *
      * A human-friendly title for display for this namespace. The title will be
      * utilized in the UI any time we need to reference this namespace, like in
@@ -112,7 +111,7 @@ def("Namespace", {
     title: or(t.string, null),
 
     /**
-     * @property {String} [symbol]
+     * @property {String?} [symbol="/"]
      *
      * The symbol is used when generating [[UIDs | CorpusUIDs]] for documents
      * in the namespace; their UID will effectively be their [[T.Node@id]]
@@ -129,8 +128,6 @@ def("Namespace", {
      * ```
      *
      * Document A above will have a UID of `X/A`.
-     *
-     * _Defaults to: `/`_
      */
     symbol: or(t.string, null),
 
@@ -214,6 +211,8 @@ def("Node", {
      */
     filePath: or(t.string, null),
 
+    loc: or(t.object, null),
+
     /**
      * @inheritdoc T.Corpus@meta
      */
diff --git a/packages/megadoc-corpus/lib/Corpus.js b/packages/megadoc-corpus/lib/Corpus.js
index af7b2095..b31b098d 100644
--- a/packages/megadoc-corpus/lib/Corpus.js
+++ b/packages/megadoc-corpus/lib/Corpus.js
@@ -184,8 +184,8 @@ function Corpus() {
     if (node.uid in nodes) {
       assert(false,
         'IntegrityViolation: a node with the UID "' + node.uid + '" already exists.' +
-        '\nOriginal node is defined in: ' + (nodes[node.uid].filePath || '<<unknown>>') +
-        '\nCurrent node is defined in: ' + (node.filePath || '<<unknown>>')
+        '\nPast definition: ' + dumpNodeFilePath(nodes[node.uid]) +
+        '\nThis definition: ' + dumpNodeFilePath(node)
       );
     }
 
@@ -269,5 +269,19 @@ function hasValidNamespaceId(node) {
   return node.id && node.id[0] !== '/' && node.id[0] !== '.';
 }
 
-module.exports = Corpus;
+function dumpNodeFilePath(node) {
+  var buffer = '<<unknown>>';
+
+  if (node && node.filePath) {
+    buffer = node.filePath;
+
+    if (node.loc && node.loc.start && node.loc.start.line) {
+      buffer += ':' + node.loc.start.line;
+    }
+  }
+
+  return buffer;
+}
 
+module.exports = Corpus;
+module.exports.dumpNodeFilePath = dumpNodeFilePath;
\ No newline at end of file
diff --git a/packages/megadoc-corpus/lib/CorpusResolver.js b/packages/megadoc-corpus/lib/CorpusResolver.js
index bdb26194..12eafdcf 100644
--- a/packages/megadoc-corpus/lib/CorpusResolver.js
+++ b/packages/megadoc-corpus/lib/CorpusResolver.js
@@ -162,7 +162,7 @@ function resolveByFilePath(anchor) {
     filePath = filePath.slice(0, -1 * entityId.length);
   }
 
-  targetPath = path.join(path.dirname(contextNode.filePath), filePath);
+  targetPath = ensureLeadingSlash(path.join(path.dirname(contextNode.filePath), filePath));
 
   var node = resolve({ text: targetPath, contextNode: anchor.contextNode });
 
@@ -191,4 +191,8 @@ function createListOfFriendNodes(node) {
   }
 
   return map;
+}
+
+function ensureLeadingSlash(s) {
+  return s[0] === '/' ? s : '/' + s;
 }
\ No newline at end of file
diff --git a/packages/megadoc-docstring/lib/utils/__tests__/neutralizeWhitespace.test.js b/packages/megadoc-docstring/lib/utils/__tests__/neutralizeWhitespace.test.js
index de2b358d..a7865861 100644
--- a/packages/megadoc-docstring/lib/utils/__tests__/neutralizeWhitespace.test.js
+++ b/packages/megadoc-docstring/lib/utils/__tests__/neutralizeWhitespace.test.js
@@ -63,4 +63,24 @@ describe('utils::neutralizeWhitespace', function() {
 
     assert.deepEqual(input, output);
   });
+
+  it('strips leading whitespace from description', function() {
+    var string = multiline(function() {;
+      //          This
+      //          is
+      //          a
+      //          multiline
+      //          description.
+    });
+
+    assert.equal(
+      neutralizeWhitespace(string)
+        // this silly hack is to work around istanbul's instrumentor /
+        // multiline-slash where when NOT instrumenting, we'll have a leading
+        // newline
+        .replace(/^\n{0,1}/, '')
+      ,
+      'This\nis\na\nmultiline\ndescription.\n    '
+    );
+  });
 });
\ No newline at end of file
diff --git a/packages/megadoc-docstring/lib/utils/neutralizeWhitespace.js b/packages/megadoc-docstring/lib/utils/neutralizeWhitespace.js
index f513ea2a..613136e8 100644
--- a/packages/megadoc-docstring/lib/utils/neutralizeWhitespace.js
+++ b/packages/megadoc-docstring/lib/utils/neutralizeWhitespace.js
@@ -9,7 +9,7 @@ var RE_MATCH_INDENT = /(?:^|\n)([ \t]*)[^\s]/;
  * @param {String} str
  * @return {String}
  */
-module.exports = function(src) {
+module.exports = function neutralizeWhitespace(src) {
   var indent = src.match(RE_MATCH_INDENT);
   if (indent && indent[1].length !== CODE_BLOCK_PADDING) {
     return src.replace(new RegExp('(^|\n)' + indent[1], 'g'), '$1');
diff --git a/packages/megadoc-docstring/package.json b/packages/megadoc-docstring/package.json
index 4780a243..27f6b1e1 100644
--- a/packages/megadoc-docstring/package.json
+++ b/packages/megadoc-docstring/package.json
@@ -29,8 +29,5 @@
   "homepage": "https://github.com/megadoc/megadoc#readme",
   "dependencies": {
     "jsdoctypeparser": "1.2.0"
-  },
-  "devDependencies": {
-    "pegjs": "0.9.0"
   }
 }
diff --git a/packages/megadoc-plugin-js/lib/Parser/Utils.js b/packages/megadoc-plugin-js/lib/Parser/ASTUtils.js
similarity index 73%
rename from packages/megadoc-plugin-js/lib/Parser/Utils.js
rename to packages/megadoc-plugin-js/lib/Parser/ASTUtils.js
index 1867a08f..50051fce 100644
--- a/packages/megadoc-plugin-js/lib/Parser/Utils.js
+++ b/packages/megadoc-plugin-js/lib/Parser/ASTUtils.js
@@ -1,16 +1,17 @@
 var nodejsPath = require('path');
 var t = require('babel-types');
+var K = require('./constants');
+var DocUtils = require('./DocUtils');
 
 var Utils = exports;
 
 Utils.isModuleExports = function(node) {
   return (
-    t.isMemberExpression(node.left)
-    && node.left.object.name === 'module'
-    && node.left.property.name === 'exports'
-    && (
-      t.isIdentifier(node.right)
-      || t.isFunctionExpression(node.right)
+    t.isMemberExpression(node.left) &&
+    node.left.object.name === 'module' &&
+    node.left.property.name === 'exports' && (
+      t.isIdentifier(node.right) ||
+      t.isFunctionExpression(node.right)
     )
   );
 };
@@ -40,13 +41,14 @@ Utils.isInstanceEntity = function(node) {
 };
 
 Utils.isFactoryModuleReturnEntity = function(node, startingPath, registry) {
+
   var modulePath = Utils.findAncestorPath(startingPath, function(path) {
     var doc = registry.getModuleDocAtPath(path);
 
     return (
       doc &&
       doc.isModule() &&
-      doc.nodeInfo.ctx.type === 'function'
+      DocUtils.isOfType(doc, K.TYPE_FUNCTION)
     );
   });
 
@@ -101,7 +103,7 @@ Utils.findScope = function(path) {
 
   do {
     scope = path.scope;
-  } while (!scope && path && (path = path.parentPath));
+  } while (!scope && ((path = path.parentPath)));
 
   return scope;
 };
@@ -114,7 +116,7 @@ Utils.findNearestPathWithComments = function(startingPath) {
 };
 
 Utils.dumpLocation = function(node, filePath) {
-  return [filePath, node.loc.start.line].join(':');
+  return [filePath, Utils.getLocation(node).start.line].join(':');
 };
 
 /**
@@ -133,16 +135,7 @@ Utils.findIdentifierInScope = function(identifierName, path) {
   if (currentScope) {
     var targetScope = currentScope.getBinding(identifierName);
 
-    // for (var x in currentScope) {
-    //   if (typeof currentScope[x] === 'function')
-    //     console.log('#' + x);
-    // }
     return targetScope && targetScope.path;
-    // console.log(targetScope)
-    // if (targetScope) {
-    //   console.log(targetScope)
-    //   return targetScope.getBinding(identifierName)[0];
-    // }
   }
 };
 
@@ -156,5 +149,28 @@ Utils.getLocation = function(node) {
     loc = node.loc;
   }
 
-  return loc || { start: {}, end: {} };
-};
\ No newline at end of file
+  return loc || {
+    start: { line: '?' },
+    end: { line: '?' }
+  };
+};
+
+// Whether there's a commenet for such a node:
+//
+//     /**
+//      * @module
+//      */
+//      var { Assertion } = require('chai');
+//
+Utils.isCommentedDestructuredProperty = function(path) {
+  return (
+    t.isIdentifier(path.node) &&
+    path.node.leadingComments &&
+    path.parentPath &&
+    t.isVariableDeclarator(path.parentPath) &&
+    path.parentPath.parentPath &&
+    t.isVariableDeclaration(path.parentPath.parentPath) &&
+    path.parentPath.parentPath.node.leadingComments &&
+    path.parentPath.parentPath.node.leadingComments[0] === path.node.leadingComments[0]
+  );
+};
diff --git a/packages/megadoc-plugin-js/lib/Parser/Doc.js b/packages/megadoc-plugin-js/lib/Parser/Doc.js
index 70d27381..d54be57b 100644
--- a/packages/megadoc-plugin-js/lib/Parser/Doc.js
+++ b/packages/megadoc-plugin-js/lib/Parser/Doc.js
@@ -1,65 +1,84 @@
 var K = require('./constants');
 var DocClassifier = require('./DocClassifier');
 var _ = require('lodash');
-var findWhere = _.findWhere;
+var DocUtils = require('./DocUtils');
+var ASTUtils = require('./ASTUtils');
 var assign = _.assign;
-var assert = require('assert');
-var debuglog = require('megadoc/lib/Logger')('megadoc').info;
 
 /**
  * @param {Docstring} docstring
  * @param {NodeInfo} nodeInfo
  * @param {String} filePath
- * @param {String} absoluteFilePath
  */
-function Doc(docstring, nodeInfo, filePath, absoluteFilePath) {
+function Doc(docstring, nodeInfo, filePath) {
   this.consumeDocstring(docstring);
   this.consumeNodeInfo(nodeInfo);
 
-  this.id = this.generateId();
-  this.name = this.generateName();
   this.filePath = filePath;
-  this.absoluteFilePath = absoluteFilePath;
-  this.customAliases = [];
 
   return this;
 }
 
-Doc.prototype.toJSON = function() {
-  var doc = assign({}, this.docstring.toJSON(), this.nodeInfo.toJSON());
+Object.defineProperty(Doc.prototype, 'id', {
+  get: function() {
+    return DocUtils.getIdOf(this);
+  }
+});
+
+Doc.prototype.toJSON = function(registry) {
+  var nodeInfo = this.nodeInfo;
+  var doc = assign({},
+    this.docstring.toJSON(),
+    this.nodeInfo.toJSON()
+  );
+
+  doc.type = DocUtils.getTypeNameOf(this);
+  doc.nodeInfo = this.nodeInfo.ctx;
 
   doc.id = this.id;
-  doc.name = this.generateName();
+  doc.name = DocUtils.getNameOf(this);
   doc.filePath = this.filePath;
-  doc.absoluteFilePath = this.absoluteFilePath;
   doc.isModule = this.isModule();
-  doc.receiver = this.getReceiver();
-  doc.mixinTargets = doc.tags.filter(function(tag) {
-    return tag.type === 'mixes';
-  }).reduce(function(list, tag) {
-    return list.concat(tag.mixinTargets);
-  }, []);
-
-  doc.aliases = doc.tags.filter(function(tag) {
-    return tag.type === 'alias';
-  }).map(function(tag) {
-    return tag.alias;
-  }).concat(this.customAliases);
-
-  // support for explicit typing using tags like @method or @type
-  if (this.docstring.hasTypeOverride()) {
-    doc.ctx.type = this.docstring.getTypeOverride();
-  }
 
   if (!doc.isModule) {
-    doc.ctx.symbol = this.generateSymbol(doc.ctx.type);
-    doc.id = [ doc.receiver, doc.id ].join(doc.ctx.symbol);
-    doc.path = [ doc.receiver, doc.name ].join(doc.ctx.symbol);
-  }
-  else {
-    doc.path = doc.id;
+    var resolvedContext = DocUtils.getReceiverAndScopeFor(this, registry);
+
+    doc.receiver = resolvedContext.receiver;
+
+    // scope
+    if (resolvedContext.scope) {
+      doc.nodeInfo.scope = resolvedContext.scope;
+    }
+    else {
+      if (nodeInfo.isInstanceEntity()) {
+        doc.nodeInfo.scope = K.SCOPE_INSTANCE;
+      }
+      else if (nodeInfo.isPrototypeEntity()) {
+        doc.nodeInfo.scope = K.SCOPE_PROTOTYPE;
+      }
+      // blegh
+      else if (
+        ASTUtils.isFactoryModuleReturnEntity(
+          this.$path.node,
+          this.$path,
+          registry
+        )
+      ) {
+        doc.nodeInfo.scope = K.SCOPE_FACTORY_EXPORTS;
+      }
+    }
+
+    doc.symbol = generateSymbol(this);
+    doc.id = doc.receiver + doc.symbol + this.id;
   }
 
+  doc.mixinTargets = doc.tags
+    .filter(function(tag) { return tag.type === 'mixes'; })
+    .map(function(tag) { return tag.typeInfo.name; })
+  ;
+
+  doc.aliases = Object.keys(this.docstring.aliases);
+
   // we'll need this for @preserveOrder support
   if (doc.loc) {
     doc.line = doc.loc.start.line;
@@ -68,8 +87,6 @@ Doc.prototype.toJSON = function() {
     });
   }
 
-  this.useSourceNameWhereNeeded(doc.name, doc);
-
   return doc;
 };
 
@@ -81,26 +98,6 @@ Doc.prototype.consumeNodeInfo = function(nodeInfo) {
   this.nodeInfo = nodeInfo;
 };
 
-Doc.prototype.generateId = function() {
-  var id = this.docstring.id || this.nodeInfo.id;
-  var namespace = this.docstring.namespace;
-
-  if (id && namespace && id.indexOf(namespace) === -1) {
-    id = [ namespace, id ].join(K.NAMESPACE_SEP);
-  }
-
-  return id;
-};
-
-Doc.prototype.generateName = function() {
-  if (this.docstring.namespace && this.id) {
-    return this.id.replace(this.docstring.namespace + K.NAMESPACE_SEP, '');
-  }
-  else {
-    return this.id;
-  }
-};
-
 Doc.prototype.markAsExported = function() {
   this.$isExported = true;
 };
@@ -110,87 +107,19 @@ Doc.prototype.isExported = function() {
 };
 
 Doc.prototype.isModule = function() {
-  return !this.docstring.hasMemberOf() && (
-    this.isExported() ||
-    this.docstring.isModule() ||
-    this.nodeInfo.isModule()
-  );
+  return DocUtils.isModule(this);
 };
 
-Doc.prototype.generateSymbol = function(type) {
-  var symbol;
-
-  switch(type) {
-    case K.TYPE_FUNCTION:
-      if (DocClassifier.isStaticMethod(this)) {
-        symbol = '.';
-      }
-      else {
-        symbol = '#';
-      }
-      break;
-
-    default:
-      if (DocClassifier.isObjectProperty(this)) {
-        symbol = '@';
-      }
-      else {
-        symbol = '.';
-      }
-      break;
+function generateSymbol(doc) {
+  if (DocClassifier.isStaticMember(doc)) {
+    return '.';
   }
-
-  if (this.docstring.hasTag('property') && !this.docstring.hasTag('static')) {
-    symbol = '@';
+  else if (DocClassifier.isMethod(doc)) {
+    return '#';
   }
-
-  if (this.docstring.hasTag('property') && this.docstring.hasTag('static')) {
-    symbol = '.';
+  else if (DocClassifier.isMember(doc)) {
+    return '@';
   }
-
-  return symbol;
-};
-
-/**
- * Set the correct receiver for this doc. The receiver might not have been
- * resolved correctly in NodeInfo due to @lends or module aliases.
- *
- * @param  {String} correctedReceiver
- *         Name of the new receiver.
- */
-Doc.prototype.overrideReceiver = function(correctedReceiver) {
-  assert(!!correctedReceiver,
-    "You are attempting to override a receiver with an undefined one!"
-  );
-
-  debuglog(
-    'Adjusting receiver from "%s" to "%s" for "%s" (scope: %s)',
-    this.nodeInfo.receiver,
-    correctedReceiver,
-    this.id,
-    this.nodeInfo.ctx && this.nodeInfo.ctx.scope
-  );
-
-  this.$correctedReceiver = correctedReceiver;
-};
-
-Doc.prototype.getReceiver = function() {
-  return this.$correctedReceiver || this.nodeInfo.receiver;
-};
-
-Doc.prototype.hasReceiver = function() {
-  return Boolean(this.getReceiver());
-};
-
-Doc.prototype.useSourceNameWhereNeeded = function(name, doc) {
-  var propertyTag = findWhere(doc.tags, { type: 'property' });
-  if (propertyTag && !propertyTag.typeInfo.name) {
-    propertyTag.typeInfo.name = name;
-  }
-};
-
-Doc.prototype.addAlias = function(name) {
-  this.customAliases.push(name);
 };
 
 module.exports = Doc;
\ No newline at end of file
diff --git a/packages/megadoc-plugin-js/lib/Parser/DocClassifier.js b/packages/megadoc-plugin-js/lib/Parser/DocClassifier.js
index 3029f8bf..498d9c93 100644
--- a/packages/megadoc-plugin-js/lib/Parser/DocClassifier.js
+++ b/packages/megadoc-plugin-js/lib/Parser/DocClassifier.js
@@ -1,4 +1,5 @@
 var K = require('./constants');
+var DocUtils = require('./DocUtils');
 
 function isModule(doc) {
   return doc.isModule();
@@ -8,28 +9,34 @@ function isEntity(doc) {
   return !doc.isModule();
 }
 
-function isMethod(doc) {
+function isMember(doc) {
   var ctx = doc.nodeInfo.ctx;
 
-  return ctx.type === K.TYPE_FUNCTION && isObjectProperty(doc);
-}
-
-function isObjectProperty(doc) {
-  var ctx = doc.nodeInfo.ctx;
-
-  return (
+  return !doc.docstring.hasTag('static') && (
     ctx.scope === K.SCOPE_FACTORY_EXPORTS ||
     ctx.scope === K.SCOPE_INSTANCE ||
     ctx.scope === K.SCOPE_PROTOTYPE
   );
 }
 
+function isStaticMember(doc) {
+  return (
+    doc.nodeInfo.ctx.scope === K.SCOPE_UNSCOPED ||
+    doc.docstring.hasTag('static')
+  );
+}
+
+function isMethod(doc) {
+  return DocUtils.isOfType(doc, K.TYPE_FUNCTION) && isMember(doc);
+}
+
 function isStaticMethod(doc) {
-  return doc.nodeInfo.ctx.type === K.TYPE_FUNCTION && !isMethod(doc);
+  return DocUtils.isOfType(doc, K.TYPE_FUNCTION) && isStaticMember(doc);
 }
 
 exports.isModule = isModule;
 exports.isEntity = isEntity;
 exports.isMethod = isMethod;
 exports.isStaticMethod = isStaticMethod;
-exports.isObjectProperty = isObjectProperty;
+exports.isMember = isMember;
+exports.isStaticMember = isStaticMember;
diff --git a/packages/megadoc-plugin-js/lib/Parser/DocUtils.js b/packages/megadoc-plugin-js/lib/Parser/DocUtils.js
new file mode 100644
index 00000000..a47e64a1
--- /dev/null
+++ b/packages/megadoc-plugin-js/lib/Parser/DocUtils.js
@@ -0,0 +1,138 @@
+var K = require('./constants');
+
+exports.getIdOf = function(doc) {
+  var name = doc.docstring.name || doc.nodeInfo.id;
+  var namespace = doc.docstring.namespace;
+
+  if (name && namespace) {
+    return namespace + K.NAMESPACE_SEP + name;
+  }
+  else {
+    return name;
+  }
+};
+
+exports.getNameOf = function(doc) {
+  return doc.docstring.name || doc.nodeInfo.id;
+};
+
+exports.getTypeOf = function(doc) {
+  if (doc.docstring.hasTypeOverride()) {
+    return doc.docstring.getTypeOverride();
+  }
+  else if (doc.nodeInfo.ctx.type) {
+    return doc.nodeInfo.ctx.type;
+  }
+
+  return K.TYPE_UNKNOWN;
+};
+
+exports.getTypeNameOf = function(doc) {
+  var type = exports.getTypeOf(doc);
+
+  return type.name || type;
+};
+
+exports.isOfType = function(doc, expectedTypeName) {
+  var typeName = exports.getTypeNameOf(doc);
+
+  return typeName === expectedTypeName;
+};
+
+exports.isModule = function(doc) {
+  return !doc.docstring.hasMemberOf() && (
+    doc.isExported() ||
+    doc.docstring.isModule() ||
+    doc.nodeInfo.isModule()
+  );
+};
+
+exports.getReceiverAndScopeFor = function(doc, registry) {
+  var receiver = doc.nodeInfo.receiver;
+  var correctedScope, exportedModule, enclosingModule, receivingModule;
+
+  // Resolve @memberOf receiver aliasing:
+  if (doc.docstring.hasMemberOf()) {
+    receiver = doc.docstring.getExplicitReceiver();
+  }
+
+  // Resolve @lends using either the original receiver or the one pointed to
+  // by @memberOf:
+  var lendEntry = (
+    registry.findAliasedLendTarget(doc.$path, receiver) ||
+    registry.findClosestLend(doc.$path)
+  );
+
+  // TODO: this needs a bit of rethinking really
+  if (lendEntry) {
+    receiver = lendEntry.receiver;
+  }
+  // CommonJS specific scenario; the entity is attached to the special "exports"
+  // variable.
+  //
+  // We need to watch out and not confuse it with "exports" Identifier nodes
+  // that are not defined in the global Program scope.
+  //
+  //     var Something = exports;
+  //         ^^^^^^^^^
+  //
+  //     // ...
+  //
+  //     /** yep */
+  //     exports.something = function() {}
+  //     ^^^^^^^
+  else if (receiver === 'exports') {
+    exportedModule = registry.findExportedModule(doc.filePath);
+
+    if (exportedModule) {
+      console.log('Correcting receiver from "exports" to "%s". Source: %s',
+        exportedModule.id,
+        exports.getLocationOf(doc)
+      );
+
+      receiver = exportedModule.id;
+    }
+  }
+  else {
+    // TODO: this too
+    enclosingModule = (
+      // registry.findAliasedReceiver(receiver) ||
+      registry.findClosestModule(doc.$path)
+    );
+
+    if (enclosingModule) {
+      receiver = enclosingModule;
+    }
+  }
+
+  if (receiver) {
+    if (receiver.match(/(.*)\.prototype$/)) {
+      receiver = RegExp.$1;
+      correctedScope = K.SCOPE_PROTOTYPE;
+    }
+
+    // Now search the Registry for a module that either has an ID or a name with
+    // our resolved receiver string:
+    receivingModule = registry.get(receiver);
+
+    if (receivingModule) {
+      receiver = receivingModule.id;
+    }
+  }
+
+  if (!receiver) {
+    console.warn(
+      "No receiver was found for the document '%s', it will be discarded.",
+      exports.getLocationOf(doc)
+    );
+  }
+
+  return { receiver: receiver, scope: correctedScope };
+};
+
+exports.getLocationOf = function(doc) {
+  return (
+    (doc.id || '<<unknown>>') + ' in ' +
+    doc.filePath + ':' + doc.nodeInfo.loc.start.line
+  );
+};
diff --git a/packages/megadoc-plugin-js/lib/Parser/Docstring.js b/packages/megadoc-plugin-js/lib/Parser/Docstring.js
index fce4f6fb..3a03f262 100644
--- a/packages/megadoc-plugin-js/lib/Parser/Docstring.js
+++ b/packages/megadoc-plugin-js/lib/Parser/Docstring.js
@@ -1,11 +1,11 @@
-var dox = require('dox');
+// var dox = require('dox');
+var parseComment = require('./parseComment');
 var assert = require('assert');
 var _ = require('lodash');
 var K = require('./constants');
-var Tag = require('./Docstring/Tag');
-var extractIdInfo = require('./Docstring/extractIdInfo');
-var collectDescription = require('./Docstring/collectDescription');
-var findWhere = _.findWhere;
+var Tag = require('./Docstring__Tag');
+var extractIdInfo = require('./Docstring__extractIdInfo');
+var collectDescription = require('./Docstring__collectDescription');
 
 /**
  * An object representing a JSDoc comment (parsed using dox).
@@ -14,23 +14,46 @@ var findWhere = _.findWhere;
  *        The JSDoc-compatible comment string to build from.
  */
 function Docstring(comment, options, filePath) {
-  var doxDocs = dox.parseComments(comment, { raw: true });
-  var idInfo;
+  var commentNode, idInfo;
 
-  assert(doxDocs.length === 1,
-    'Dox should not extract more than 1 doc from an expression.'
+  try {
+    commentNode = parseComment(comment);
+  }
+  catch(e) {
+    throw new Error('Comment parse failed: "' + e.message + '" Source:\n' + comment);
+  }
+
+  if (commentNode.length === 0) {
+    throw new Error('Invalid annotation in comment block. Source:\n' + comment);
+  }
+
+  assert(commentNode.length === 1,
+    'Comment parser should yield a single node, not ' + commentNode.length + '! ' +
+    'Source:\n' + comment
   );
 
-  this._doxDocs = doxDocs;
-  this.tags = doxDocs[0].tags.map(function(doxTag) {
+  this.tags = commentNode[0].tags.map(function(doxTag) {
     return new Tag(doxTag, options || {}, filePath);
   });
 
   idInfo = extractIdInfo(this.tags);
 
-  this.id = idInfo.id;
+  // this.id = idInfo.id;
+  this.name = idInfo.name;
   this.namespace = idInfo.namespace;
-  this.description = collectDescription(doxDocs[0], this.id, this.tags);
+  this.description = collectDescription(commentNode[0], this.id, this.tags);
+  this.aliases = this.tags.filter(function(tag) {
+    return tag.type === 'alias';
+  }).reduce(function(map, tag) {
+    map[tag.typeInfo.name] = true;
+    return map;
+  }, {});
+
+  this.$location = (
+    (this.namespace ? this.namespace + K.NAMESPACE_SEP : '') +
+    (this.name || '') + ' in ' +
+    filePath
+  );
 
   return this;
 }
@@ -40,8 +63,10 @@ var Dpt = Docstring.prototype;
 /**
  * @return {Object} doc
  *
- * @return {String} doc.id
- *         The explicit module id found in a @module tag, if any.
+ * @return {String} doc.name
+ *         If this is a module, it will be the name of the module found in a
+ *         @module tag, or a @name tag. Otherwise, it's what may be found in a
+ *         @name tag, a @property tag, or a @method tag. See [extractIdInfo]().
  *
  * @return {String} doc.namespace
  *         The namespace name found in a @namespace tag, if any.
@@ -54,7 +79,7 @@ var Dpt = Docstring.prototype;
  */
 Docstring.prototype.toJSON = function() {
   var docstring = _.pick(this, [
-    'id',
+    'name',
     'namespace',
     'description',
   ]);
@@ -74,16 +99,12 @@ Dpt.isInternal = function() {
   return this.hasTag('internal');
 };
 
-Dpt.isMethod = function() {
-  return this.hasTag('method');
-};
-
 Dpt.doesLend = function() {
   return this.hasTag('lends');
 };
 
 Dpt.getLentTo = function() {
-  return this.getTag('lends').lendReceiver;
+  return this.getTag('lends').typeInfo.name;
 };
 
 Dpt.hasMemberOf = function() {
@@ -91,39 +112,55 @@ Dpt.hasMemberOf = function() {
 };
 
 Dpt.getExplicitReceiver = function() {
-  return this.getTag('memberOf').explicitReceiver;
+  return this.getTag('memberOf').typeInfo.name;
 };
 
 Dpt.hasTag = function(type) {
-  return !!findWhere(this.tags, { type: type });
+  return this.tags.some(findByType(type));
 };
 
 Dpt.getTag = function(type) {
-  return findWhere(this.tags, { type: type });
+  return this.tags.filter(findByType(type))[0];
+};
+
+Dpt.hasAlias = function(alias) {
+  return alias in this.aliases;
 };
 
 Dpt.hasTypeOverride = function() {
-  return this.tags.filter(function(tag) {
-    return !!tag.explicitType;
-  }).length > 0;
+  return getTypeOverridingTags(this.tags).length > 0;
 };
 
 Dpt.getTypeOverride = function() {
-  return this.tags.filter(function(tag) {
-    return !!tag.explicitType;
-  })[0].explicitType;
+  var typedTags = getTypeOverridingTags(this.tags);
+
+  if (typedTags.length > 1) {
+    console.warn("Document has multiple type overrides! Source: %s",
+      this.$location
+    );
+  }
+
+  return typedTags[0].typeInfo.type;
 };
 
 Dpt.overrideNamespace = function(namespace) {
-  var oldNamespace = this.namespace;
-
   this.namespace = namespace;
+};
 
-  if (oldNamespace && this.id) {
-    this.id = this.id.replace(oldNamespace + K.NAMESPACE_SEP, '');
-  }
-
-  // this will FUBAR if we have @namespace tags ...
+Dpt.addAlias = function(name) {
+  this.aliases[name] = true;
 };
 
-module.exports = Docstring;
\ No newline at end of file
+module.exports = Docstring;
+
+function getTypeOverridingTags(tags) {
+  return tags.filter(function(tag) {
+    return tag.type in K.TYPE_OVERRIDING_TAGS;
+  });
+}
+
+function findByType(type) {
+  return function(x) {
+    return x.type === type;
+  }
+}
\ No newline at end of file
diff --git a/packages/megadoc-plugin-js/lib/Parser/Docstring/Tag.js b/packages/megadoc-plugin-js/lib/Parser/Docstring/Tag.js
deleted file mode 100644
index 8fe39f1c..00000000
--- a/packages/megadoc-plugin-js/lib/Parser/Docstring/Tag.js
+++ /dev/null
@@ -1,257 +0,0 @@
-var parseProperty = require('./Tag/parseProperty');
-var extractDefaultValue = require('./Tag/extractDefaultValue');
-var neutralizeWhitespace = require('./Tag/neutralizeWhitespace');
-var K = require('../constants');
-var assert = require('assert');
-
-var TypeAliases = {
-  'returns': 'return'
-};
-
-/**
- * @param {Object} doxTag
- * @param {Object} options
- * @param {Object} options.customTags
- * @param {Boolean} [options.namedReturnTags=true]
- *
- * @param {String} filePath
- */
-function Tag(doxTag, options, filePath) {
-  var customTags = options.customTags;
-
-  /**
-   * @property {String}
-   *           The type of this tag. This is always present.
-   */
-  this.type = TypeAliases[doxTag.type] || doxTag.type;
-
-  /**
-   * @property {String}
-   *           The raw text.
-   */
-  this.string = String(doxTag.string || '')
-
-  /**
-   * @property {String}
-   *           Module namepath pointed to by @alias.
-   */
-  this.alias = null;
-
-  /**
-   * @property {String} visibility
-   */
-  this.visibility = null;
-
-  /**
-   * @property {String}
-   *           Module namepath pointed to by @memberOf.
-   */
-  this.explicitReceiver = null;
-
-  /**
-   * @property {String}
-   *           Would be "function" for @method tags, or whatever is specified
-   *           by a @type tag.
-   */
-  this.explicitType = null;
-
-  /**
-   * @property {String}
-   *           Name of the module that is lent to by the enclosing doc.
-   *
-   *           Available only for @lends tags.
-   */
-  this.lendReceiver = null;
-
-  this.mixinTargets = [];
-
-  /**
-   * @property {String}
-   *           Available on @property, @type, @param, and @live_example tags.
-   */
-  this.typeInfo = {
-    /**
-     * @property {String}
-     */
-    name: null,
-
-    /**
-     * @property {String}
-     */
-    description: null,
-
-    /**
-     * @property {Boolean}
-     */
-    isOptional: null,
-
-    /**
-     * @property {String}
-     */
-    defaultValue: null,
-
-    /**
-     * @property {String[]}
-     */
-    types: []
-  };
-
-  switch(this.type) {
-    case 'property':
-    case 'param':
-    case 'return':
-    case 'throws':
-    case 'example':
-    case 'interface':
-      this.typeInfo = TypeInfo(doxTag);
-
-      // fixup for return tags when we're not expecting them to be named
-      if (this.type === 'return' && this.typeInfo.name && options.namedReturnTags === false) {
-        this.typeInfo.description = this.typeInfo.name + ' ' + this.typeInfo.description;
-        this.typeInfo.name = undefined;
-      }
-
-      break;
-
-    case 'type':
-      // console.assert(doxTag.types.length === 1,
-      //   "Expected @type tag to contain only a single type, but it contained %d.",
-      //   doxTag.types.length
-      // );
-      this.typeInfo = TypeInfo(doxTag);
-      this.string = this.string.replace(doxTag.string, '');
-
-      if (doxTag.types.length === 1) {
-        this.explicitType = renamePrimitiveType(doxTag.types[0].trim());
-      }
-
-      break;
-
-    // if it was marked @method, treat it as such (not stupid "property" type
-    // on object modules)
-    case 'method':
-      this.explicitType = K.TYPE_FUNCTION;
-      this.typeInfo = TypeInfo(doxTag);
-
-      break;
-
-    case 'protected':
-      this.visibility = K.VISIBILITY_PROTECTED;
-      break;
-
-    case 'private':
-      this.visibility = K.VISIBILITY_PRIVATE;
-      break;
-
-    case 'memberOf':
-      this.explicitReceiver = doxTag.parent;
-
-      // @memberOf's "parent" property (which is the target class name) will be
-      // present in the string so we remove it:
-      this.string = this.string.replace(this.explicitReceiver, '');
-
-      break;
-
-    case 'alias':
-      this.alias = this.string.split('\n')[0].trim();
-
-      // same deal with @memberOf
-      this.string = this.string.replace(this.alias, '');
-
-      break;
-
-    case 'lends':
-      this.lendReceiver = doxTag.parent;
-      break;
-
-    case 'mixes':
-      var firstLine = this.string.split('\n')[0].trim();
-      this.mixinTargets = firstLine.split(/\s+/);
-      this.string = this.string.replace(firstLine, '');
-      break;
-
-    default:
-      if (customTags && customTags.hasOwnProperty(doxTag.type)) {
-        this.useCustomTagDefinition(doxTag, customTags[doxTag.type], filePath);
-      }
-  }
-
-  return this;
-}
-
-Tag.prototype.adjustString = function(newString) {
-  this.string = newString;
-};
-
-Tag.prototype.toJSON = function() {
-  return Object.keys(this).reduce(function(json, key) {
-    if (this[key] !== null && typeof this[key] !== 'function') {
-      json[key] = this[key];
-    }
-
-    return json;
-  }.bind(this), {});
-};
-
-Tag.prototype.useCustomTagDefinition = function(doxTag, customTag, filePath) {
-  var customAttributes = customTag.attributes || [];
-
-  if (customTag.withTypeInfo) {
-    this.typeInfo = TypeInfo(doxTag);
-  }
-
-  if (customTag.process instanceof Function) {
-    customTag.process(createCustomTagAPI(this, customAttributes), filePath);
-  }
-};
-
-function createCustomTagAPI(tag, attrWhitelist) {
-  var api = tag.toJSON();
-
-  api.setCustomAttribute = function(name, value) {
-    assert(attrWhitelist.indexOf(name) > -1,
-      "Unrecognized custom attribute '" + name + "'. Make sure you " +
-      "you specify it in the @attributes array for the customTag."
-    );
-
-    tag[name] = value;
-  };
-
-  return api;
-}
-
-module.exports = Tag;
-
-function renamePrimitiveType(type) {
-  if (type === 'Function') {
-    return 'function';
-  }
-  else {
-    return type;
-  }
-}
-
-function TypeInfo(doxTag) {
-  var typeInfo = parseProperty(doxTag.string);
-
-  if (typeInfo.description) {
-    typeInfo.description = neutralizeWhitespace(typeInfo.description);
-  }
-
-  if (typeInfo.name) {
-    if (doxTag.name && doxTag.name !== typeInfo.name) {
-      typeInfo.name = doxTag.name;
-      typeInfo.description = doxTag.description;
-    }
-
-    var nameFragments = extractDefaultValue(typeInfo.name);
-
-    if (nameFragments) {
-      typeInfo.name = nameFragments.name;
-      typeInfo.defaultValue = nameFragments.defaultValue;
-    }
-  }
-
-
-  return typeInfo;
-}
diff --git a/packages/megadoc-plugin-js/lib/Parser/Docstring/Tag/__tests__/neutralizeWhitespace.test.js b/packages/megadoc-plugin-js/lib/Parser/Docstring/Tag/__tests__/neutralizeWhitespace.test.js
deleted file mode 100644
index f1711e75..00000000
--- a/packages/megadoc-plugin-js/lib/Parser/Docstring/Tag/__tests__/neutralizeWhitespace.test.js
+++ /dev/null
@@ -1,29 +0,0 @@
-var neutralizeWhitespace = require('../neutralizeWhitespace');
-var assert = require('chai').assert;
-var multiline = require('multiline-slash');
-
-var parse = function(strGenerator) {
-  return neutralizeWhitespace(multiline(strGenerator));
-};
-
-describe('CJS::Parser::Docstring::Tag::neutralizeWhitespace', function() {
-  it('strips leading whitespace from description', function() {
-    var string = parse(function() {;
-      //          This
-      //          is
-      //          a
-      //          multiline
-      //          description.
-    });
-
-    assert.equal(
-      string
-        // this silly hack is to work around istanbul's instrumentor /
-        // multiline-slash where when NOT instrumenting, we'll have a leading
-        // newline
-        .replace(/^\n{0,1}/, '')
-      ,
-      'This\nis\na\nmultiline\ndescription.\n'
-    );
-  });
-});
\ No newline at end of file
diff --git a/packages/megadoc-plugin-js/lib/Parser/Docstring/Tag/extractDefaultValue.js b/packages/megadoc-plugin-js/lib/Parser/Docstring/Tag/extractDefaultValue.js
deleted file mode 100644
index c8dd84db..00000000
--- a/packages/megadoc-plugin-js/lib/Parser/Docstring/Tag/extractDefaultValue.js
+++ /dev/null
@@ -1,17 +0,0 @@
-var RE = new RegExp('\s*([^=]+)=(.+)\s*');
-
-module.exports = function extractDefaultValue(string) {
-  if (string[0] === '[' && string[string.length-1] === ']') {
-    if (string.slice(1,-1).match(RE)) {
-      return { name: RegExp.$1, defaultValue: RegExp.$2 };
-    }
-    else {
-      return {
-        name: string.slice(1,-1),
-        defaultValue: null
-      }
-    }
-  }
-
-  return null;
-};
\ No newline at end of file
diff --git a/packages/megadoc-plugin-js/lib/Parser/Docstring/Tag/neutralizeWhitespace.js b/packages/megadoc-plugin-js/lib/Parser/Docstring/Tag/neutralizeWhitespace.js
deleted file mode 100644
index cee74bef..00000000
--- a/packages/megadoc-plugin-js/lib/Parser/Docstring/Tag/neutralizeWhitespace.js
+++ /dev/null
@@ -1,36 +0,0 @@
-var CODE_BLOCK_PADDING = 4;
-
-module.exports = function(src) {
-  if (!src) {
-    return;
-  }
-
-  var lines = src.split('\n');
-
-  var padding;
-  var firstNonBlankLine;
-  var lineIter, line;
-
-  for (lineIter = 0; lineIter < lines.length; ++lineIter) {
-    line = lines[lineIter];
-
-    if (line.trim().length > 0) {
-      firstNonBlankLine = line;
-      break;
-    }
-  }
-
-  if (firstNonBlankLine) {
-    if (firstNonBlankLine.match(/^(\s+)/)) {
-      padding = RegExp.$1.length;
-
-      if (padding > 0 && padding !== CODE_BLOCK_PADDING) {
-        return lines.map(function(_line) {
-          return _line.substr(padding);
-        }).join('\n');
-      }
-    }
-  }
-
-  return src;
-};
\ No newline at end of file
diff --git a/packages/megadoc-plugin-js/lib/Parser/Docstring/Tag/parseProperty.js b/packages/megadoc-plugin-js/lib/Parser/Docstring/Tag/parseProperty.js
deleted file mode 100644
index de021635..00000000
--- a/packages/megadoc-plugin-js/lib/Parser/Docstring/Tag/parseProperty.js
+++ /dev/null
@@ -1,99 +0,0 @@
-var TYPE_SPLITTER = /,|\|/
-
-function parseProperty(docstring) {
-  var typeInfo = {};
-
-  var STATE_PARSING_NONE = 0;
-  var STATE_PARSING_TYPE = 1;
-  var STATE_PARSING_NAME = 2;
-  var STATE_PARSING_DEFAULT_VALUE = 3;
-  var STATE_PARSING_DESCRIPTION = 4;
-  var state = STATE_PARSING_NONE;
-
-  var typeStr;
-  var nameStr;
-  var descStr;
-
-  docstring.split('').forEach(function(char) {
-    switch (state) {
-      case STATE_PARSING_NONE:
-        if (char === '{') {
-          typeStr = '';
-          state = STATE_PARSING_TYPE;
-        }
-        else if (/\s/.test(char)) {
-          state = STATE_PARSING_DESCRIPTION;
-        }
-        else {
-          nameStr = char;
-          state = STATE_PARSING_NAME;
-        }
-
-        break;
-
-      case STATE_PARSING_TYPE:
-        if (char === '}') {
-          state = STATE_PARSING_NAME;
-          nameStr = '';
-        }
-        else {
-          typeStr += char;
-        }
-
-        break;
-
-      case STATE_PARSING_NAME:
-        if (char === '[') {
-          typeInfo.isOptional = true;
-        }
-        else if (char === '=') {
-          state = STATE_PARSING_DEFAULT_VALUE;
-          typeInfo.defaultValue = '';
-        }
-        else if (char === '\n') {
-          state = STATE_PARSING_DESCRIPTION;
-        }
-        else if (char !== ']') {
-          nameStr += char;
-        }
-
-        break;
-
-      case STATE_PARSING_DEFAULT_VALUE:
-        if (char === '\n') {
-          state = STATE_PARSING_DESCRIPTION;
-        }
-        else if (char !== ']') {
-          typeInfo.defaultValue += char;
-        }
-        break;
-
-      case STATE_PARSING_DESCRIPTION:
-        if (!descStr) {
-          descStr = '';
-        }
-
-        descStr += char;
-
-        break;
-    }
-  });
-
-  if (typeStr) {
-    typeInfo.types = typeStr.split(TYPE_SPLITTER);
-  }
-  else {
-    typeInfo.types = [];
-  }
-
-  typeInfo.name = nameStr && nameStr.trim().length > 0 ?
-    nameStr.trim() :
-    null
-  ;
-
-  typeInfo.description = descStr || null;
-
-  return typeInfo;
-}
-
-module.exports = parseProperty;
\ No newline at end of file
diff --git a/packages/megadoc-plugin-js/lib/Parser/Docstring/collectDescription.js b/packages/megadoc-plugin-js/lib/Parser/Docstring/collectDescription.js
deleted file mode 100644
index ad3db46a..00000000
--- a/packages/megadoc-plugin-js/lib/Parser/Docstring/collectDescription.js
+++ /dev/null
@@ -1,61 +0,0 @@
-var NO_DESCRIPTION_TAGS = [
-  'memberOf',
-  'constructor',
-  'class',
-  'module',
-  'extends',
-  'private',
-  'mixin',
-  'mixes',
-  'preserveOrder',
-  'alias',
-  'type',
-  'method',
-  'inheritdoc',
-];
-
-function extractSwallowedDescriptionInTag(tag, fragments) {
-  // Extract class description; sometimes it's kept in description.full,
-  // other times it's swalloed inside a tag of type "class" or "constructor"
-  if (NO_DESCRIPTION_TAGS.indexOf(tag.type) > -1) {
-    if (tag.explicitReceiver) {
-      tag.adjustString(tag.string.replace(tag.explicitReceiver, ''));
-    }
-
-    fragments.push(tag.string.trim());
-  }
-
-  // if there was a @namespace tag with some description of the module below
-  // it, it would "consume" that description so we need to rewrite it to
-  // the module's doc. Example docstring:
-  //
-  //     /**
-  //      * @namespace Core
-  //      *
-  //      * My module description.
-  //      */
-  //      function MyModule() {}
-  else if (tag.type === 'namespace') {
-    var nsDescription = tag.string.split('\n').slice(1).join('\n');
-    fragments.push(nsDescription);
-  }
-}
-
-module.exports = function(doxDoc, id, tags) {
-  var description = String(doxDoc.description.full);
-
-  var fragments = tags.reduce(function(_fragments, tag) {
-    extractSwallowedDescriptionInTag(tag, _fragments);
-    return _fragments;
-  }, []);
-
-  if (fragments.length > 0) {
-    description = [ description ].concat(fragments).join('');
-  }
-
-  if (id && description.substr(0, id.length) === id) {
-    description = description.replace(id, '');
-  }
-
-  return description.trim();
-};
\ No newline at end of file
diff --git a/packages/megadoc-plugin-js/lib/Parser/Docstring/extractIdInfo.js b/packages/megadoc-plugin-js/lib/Parser/Docstring/extractIdInfo.js
deleted file mode 100644
index 879ae2da..00000000
--- a/packages/megadoc-plugin-js/lib/Parser/Docstring/extractIdInfo.js
+++ /dev/null
@@ -1,56 +0,0 @@
-var K = require('../constants');
-var findWhere = require('lodash').findWhere;
-
-function extractIdInfo(tags) {
-  var id, namespace;
-
-  // extract the module id from a @module tag:
-  var moduleTag = findWhere(tags, { type: 'module' });
-  if (moduleTag) {
-    var moduleId = moduleTag.string.match(/^([\w\.]+)\s*$|^([\w\.]+)\s*\n/);
-
-    if (moduleId) {
-      id = moduleId[1] || moduleId[2];
-    }
-  }
-
-  // extract the namespace from a @namespace tag:
-  var nsTag = findWhere(tags, { type: 'namespace' });
-  if (nsTag) {
-    var namespaceString = nsTag.string.split('\n')[0].trim();
-
-    if (namespaceString.length) {
-      namespace = namespaceString;
-    }
-    else {
-      console.warn('@namespace tag must have a name.');
-    }
-  }
-  // check for inline namespaces found in a module id string
-  else if (id && id.indexOf(K.NAMESPACE_SEP) > -1) {
-    namespace = id
-      .split(K.NAMESPACE_SEP)
-      .slice(0, -1)
-      .join(K.NAMESPACE_SEP)
-    ;
-  }
-
-  var methodTag = findWhere(tags, { type: 'method' });
-
-  if (methodTag && methodTag.typeInfo.name) {
-    id = methodTag.typeInfo.name;
-  }
-
-  var propertyTag = findWhere(tags, { type: 'property' });
-
-  if (propertyTag && propertyTag.typeInfo.name) {
-    id = propertyTag.typeInfo.name;
-  }
-
-  return {
-    id: id,
-    namespace: namespace
-  };
-}
-
-module.exports = extractIdInfo;
\ No newline at end of file
diff --git a/packages/megadoc-plugin-js/lib/Parser/Docstring__Tag.js b/packages/megadoc-plugin-js/lib/Parser/Docstring__Tag.js
new file mode 100644
index 00000000..8da06a0a
--- /dev/null
+++ b/packages/megadoc-plugin-js/lib/Parser/Docstring__Tag.js
@@ -0,0 +1,173 @@
+var K = require('./constants');
+var TypeInfo = require('./Docstring__TagTypeInfo');
+var assert = require('assert');
+
+var TypeAliases = {
+  'returns': 'return'
+};
+
+/**
+ * @param {Object} commentNode
+ * @param {Object} options
+ * @param {Object} options.customTags
+ * @param {Boolean} [options.namedReturnTags=true]
+ *
+ * @param {String} filePath
+ */
+function Tag(commentNode, options, filePath) {
+  var customTags = options.customTags;
+
+  if (commentNode.errors && commentNode.errors.length) {
+    throw new Error(commentNode.errors[0]);
+  }
+
+  /**
+   * @property {String}
+   *           The type of this tag. This is always present.
+   */
+  this.type = TypeAliases[commentNode.tag] || commentNode.tag;
+
+  /**
+   * @property {String}
+   *           The raw text.
+   */
+  this.string = String(commentNode.description || '');
+
+  /**
+   * @property {String}
+   *           Available on @property, @type, @param, and @live_example tags.
+   */
+  this.typeInfo = {
+    /**
+     * @property {String}
+     */
+    name: null,
+
+    /**
+     * @property {String}
+     */
+    description: null,
+
+    /**
+     * @property {Boolean}
+     */
+    isOptional: null,
+
+    /**
+     * @property {String}
+     */
+    defaultValue: null,
+
+    /**
+     * @property {TagTypeInfo} typeInfo.type
+     */
+    type: null
+  };
+
+  switch(this.type) {
+    case 'property':
+    case 'param':
+    case 'return':
+    case 'throws':
+    case 'example':
+    case 'interface':
+      this.typeInfo = TypeInfo(commentNode);
+
+      // fixup for return tags when we're not expecting them to be named
+      if (this.type === 'return' && this.typeInfo.name && options.namedReturnTags === false) {
+        this.typeInfo.description = this.typeInfo.name + ' ' + this.typeInfo.description;
+        delete this.typeInfo.name;
+      }
+
+      break;
+
+    case 'type':
+      this.typeInfo = TypeInfo(commentNode);
+
+      break;
+
+    case 'method':
+      this.typeInfo = TypeInfo(commentNode);
+      this.typeInfo.type = { name: K.TYPE_FUNCTION };
+
+      break;
+
+    case 'protected':
+    case 'private':
+      break;
+
+    case 'memberOf':
+      this.typeInfo.name = commentNode.name;
+
+      break;
+
+    case 'module':
+      if (commentNode.name.trim().length > 0) {
+        this.typeInfo.name = commentNode.name.trim();
+      }
+      break;
+
+    case 'namespace':
+    case 'name':
+    case 'alias':
+    case 'lends':
+    case 'mixes':
+    case 'see':
+      this.typeInfo.name = commentNode.name;
+      break;
+  }
+
+  if (customTags && customTags.hasOwnProperty(this.type)) {
+    this.useCustomTagDefinition(commentNode, customTags[this.type], filePath);
+  }
+
+  return this;
+}
+
+Tag.prototype.toJSON = function() {
+  return Object.keys(this).reduce(function(json, key) {
+    if (this[key] !== null && typeof this[key] !== 'function' && key[0] !== '$') {
+      json[key] = this[key];
+    }
+
+    return json;
+  }.bind(this), {});
+};
+
+Tag.prototype.useCustomTagDefinition = function(commentNode, customTag, filePath) {
+  var customAttributes = customTag.attributes || [];
+
+  if (customTag.withTypeInfo) {
+    this.typeInfo = TypeInfo(commentNode);
+  }
+
+  if (customTag.process instanceof Function) {
+    customTag.process(createCustomTagAPI(this, customAttributes), filePath);
+  }
+};
+
+function createCustomTagAPI(tag, attrWhitelist) {
+  var api = tag.toJSON();
+
+  api.setCustomAttribute = function(name, value) {
+    assert(attrWhitelist.indexOf(name) > -1,
+      "Unrecognized custom attribute '" + name + "'. Make sure you " +
+      "you specify it in the @attributes array for the customTag."
+    );
+
+    tag[name] = value;
+  };
+
+  return api;
+}
+
+module.exports = Tag;
+
+// function renamePrimitiveType(type) {
+//   if (type === 'Function') {
+//     return 'function';
+//   }
+//   else {
+//     return type;
+//   }
+// }
diff --git a/packages/megadoc-plugin-js/lib/Parser/Docstring__TagTypeInfo.js b/packages/megadoc-plugin-js/lib/Parser/Docstring__TagTypeInfo.js
new file mode 100644
index 00000000..5e45d685
--- /dev/null
+++ b/packages/megadoc-plugin-js/lib/Parser/Docstring__TagTypeInfo.js
@@ -0,0 +1,73 @@
+var parseTypes = require('./Docstring__parseTypeString');
+
+function TypeInfo(commentNode) {
+  var description = commentNode.description;
+  var name = (commentNode.name || '').trim();
+  var typeInfo = {};
+
+  if (name.length > 0) {
+    typeInfo.name = name;
+  }
+
+  var hasType = commentNode.type && commentNode.type.length > 0;
+
+  // Example tags without a type but with a name:
+  //
+  //     /**
+  //      * @example Do something.
+  //      */
+  //
+  // Gives us:
+  //
+  //     {
+  //       name: 'Do',
+  //       description: 'something'
+  //     }
+  //
+  // But we want:
+  //
+  //     {
+  //       description: 'Do something.'
+  //     }
+  //
+  if (commentNode.tag === 'example' && !hasType) {
+    if (commentNode.name.trim().length > 0) {
+      console.warn("Invalid @example tag: this tag does not support a name.");
+    }
+    // description = commentNode.source.split('\n').slice(1).join('\n')
+      // .replace(/^\n+/, '\n')
+      // .replace(/\n+$/, '\n')
+    ;
+    // description = (
+    //   commentNode.name +
+    //   (commentNode.name.match(/\s$/) ? '' : ' ') +
+    //   commentNode.description
+    // );
+
+    delete typeInfo.name;
+  }
+
+  if (description && description.length > 0) {
+    typeInfo.description = description;
+  }
+
+  if (hasType) {
+    typeInfo.type = parseTypes(commentNode.type);
+
+    if (!typeInfo.type || !typeInfo.type.name) {
+      delete typeInfo.type;
+    }
+  }
+
+  if (commentNode.optional) {
+    typeInfo.isOptional = true;
+
+    if (commentNode.default) {
+      typeInfo.defaultValue = commentNode.default;
+    }
+  }
+
+  return typeInfo;
+}
+
+module.exports = TypeInfo;
diff --git a/packages/megadoc-plugin-js/lib/Parser/Docstring__collectDescription.js b/packages/megadoc-plugin-js/lib/Parser/Docstring__collectDescription.js
new file mode 100644
index 00000000..14125d3b
--- /dev/null
+++ b/packages/megadoc-plugin-js/lib/Parser/Docstring__collectDescription.js
@@ -0,0 +1,12 @@
+var NO_DESCRIPTION_TAGS = require('./constants').NO_DESCRIPTION_TAGS;
+
+module.exports = function(commentNode, id, tags) {
+  var description = String(commentNode.description || '').trim();
+
+  return tags
+    .filter(function(x) { return x.type in NO_DESCRIPTION_TAGS })
+    .reduce(function(buffer, x) {
+      return buffer + x.string.trim();
+    }, description)
+  ;
+};
\ No newline at end of file
diff --git a/packages/megadoc-plugin-js/lib/Parser/Docstring__extractIdInfo.js b/packages/megadoc-plugin-js/lib/Parser/Docstring__extractIdInfo.js
new file mode 100644
index 00000000..ebf5f5a2
--- /dev/null
+++ b/packages/megadoc-plugin-js/lib/Parser/Docstring__extractIdInfo.js
@@ -0,0 +1,57 @@
+var K = require('./constants');
+var findWhere = require('lodash').findWhere;
+
+function extractIdInfo(tags) {
+  var name, id;
+  var namespace = getNameFromTag(tags, 'namespace');
+  var fqid = id = getNameFromTag(tags, 'module');
+
+  // check for inline namespaces found in a module id string
+  if (fqid && fqid.indexOf(K.NAMESPACE_SEP) > -1) {
+    if (namespace) {
+      console.warn(
+        "Document '%s' already has a namespace specified using the " +
+        "@namespace tag, it should not have a namespace in its name as well.",
+        fqid
+      );
+    }
+
+    namespace = fqid
+      .split(K.NAMESPACE_SEP)
+      .slice(0, -1)
+      .join(K.NAMESPACE_SEP)
+    ;
+  }
+
+  // try getting the ID from other tags, but these do not allow implicit
+  // namespacing:
+  if (!id) {
+    id = (
+      getNameFromTag(tags, 'name') ||
+      getNameFromTag(tags, 'method') ||
+      getNameFromTag(tags, 'property')
+    );
+  }
+
+  if (id && namespace && id.indexOf(namespace + K.NAMESPACE_SEP) === 0) {
+    name = id.substr(namespace.length + 1);
+  }
+  else {
+    name = id;
+  }
+
+  return {
+    name: name,
+    namespace: namespace
+  };
+}
+
+module.exports = extractIdInfo;
+
+function getNameFromTag(tags, tagType) {
+  var tag = findWhere(tags, { type: tagType });
+
+  if (tag && tag.typeInfo.name) {
+    return tag.typeInfo.name;
+  }
+}
\ No newline at end of file
diff --git a/packages/megadoc-plugin-js/lib/Parser/Docstring__parseTypeString.js b/packages/megadoc-plugin-js/lib/Parser/Docstring__parseTypeString.js
new file mode 100644
index 00000000..89fba436
--- /dev/null
+++ b/packages/megadoc-plugin-js/lib/Parser/Docstring__parseTypeString.js
@@ -0,0 +1,84 @@
+var catharsis = require('catharsis');
+var K = require('./constants');
+var CATHARSIS_OPTIONS = { jsdoc: true, useCache: false };
+
+module.exports = function parseTypeString(typeString) {
+  return reduceCatharsis(catharsis.parse(typeString, CATHARSIS_OPTIONS));
+};
+
+/**
+ * @typedef {TagTypeInfo}
+ * @property {String} name
+ * @property {?Boolean} nullable
+ * @property {?Boolean} optional
+ * @property {?Boolean} repeatable
+ * @property {?Array.<TagTypeInfo>} elements
+ * @property {?Array.<TagTypeInfo>} params
+ * @property {?TagTypeInfo} returnValue
+ * @property {?TagTypeInfo} key
+ * @property {?TagTypeInfo} value
+ */
+function reduceCatharsis(typeInfo) {
+  var info = {};
+
+  if (typeInfo.type === 'NameExpression') {
+    info.name = typeInfo.name;
+
+    if (typeInfo.nullable) {
+      info.nullable = true;
+    }
+    else if (typeInfo.nullable === false) {
+      info.nullable = false;
+    }
+
+    if (typeInfo.optional) {
+      info.optional = true;
+    }
+    else if (typeInfo.optional === false) {
+      info.optional = false;
+    }
+
+    if (typeInfo.repeatable) {
+      info.repeatable = true;
+    }
+  }
+  else if (typeInfo.type === 'TypeApplication') {
+    info = reduceCatharsis(typeInfo.expression);
+
+    if (typeInfo.applications) {
+      info.elements = typeInfo.applications.map(reduceCatharsis);
+    }
+  }
+  else if (typeInfo.type === 'TypeUnion') {
+    info.name = K.TYPE_UNION;
+    info.elements = typeInfo.elements.map(reduceCatharsis);
+  }
+  else if (typeInfo.type === 'FunctionType') {
+    info.name = K.TYPE_FUNCTION;
+
+    if (typeInfo.params && typeInfo.params.length) {
+      info.params = typeInfo.params.map(reduceCatharsis);
+    }
+
+    if (typeInfo.result) {
+      info.returnType = reduceCatharsis(typeInfo.result);
+    }
+  }
+  else if (typeInfo.type === 'AllLiteral') {
+    info.name = K.TYPE_ALL_LITERAL;
+  }
+  else if (typeInfo.type === 'UnknownLiteral') {
+    info.name = K.TYPE_UNKNOWN_LITERAL;
+  }
+  else if (typeInfo.type === 'RecordType') {
+    info.name = K.TYPE_OBJECT;
+    info.elements = typeInfo.fields.map(reduceCatharsis);
+  }
+  else if (typeInfo.type === 'FieldType') {
+    info.name = K.TYPE_OBJECT_PROPERTY;
+    info.key = reduceCatharsis(typeInfo.key);
+    info.value = reduceCatharsis(typeInfo.value);
+  }
+
+  return info;
+}
\ No newline at end of file
diff --git a/packages/megadoc-plugin-js/lib/Parser/NodeAnalyzer.js b/packages/megadoc-plugin-js/lib/Parser/NodeAnalyzer.js
index b9405269..1be948eb 100644
--- a/packages/megadoc-plugin-js/lib/Parser/NodeAnalyzer.js
+++ b/packages/megadoc-plugin-js/lib/Parser/NodeAnalyzer.js
@@ -1,5 +1,5 @@
 var runAllSync = require('../utils/runAllSync');
-var analyzeNode = require('./NodeAnalyzer/analyzeNode');
+var analyzeNode = require('./NodeAnalyzer__analyzeNode');
 var t = require('babel-types');
 
 var NodeAnalyzer = exports;
@@ -7,7 +7,9 @@ var NodeAnalyzer = exports;
 NodeAnalyzer.analyze = function(node, path, filePath, config) {
   var nodeInfo = analyzeNode(node, path, filePath, config);
 
-  runAllSync(config.nodeAnalyzers || [], [ t, node, path, nodeInfo ]);
+  if (config.nodeAnalyzers && config.nodeAnalyzers.length) {
+    runAllSync(config.nodeAnalyzers, [ t, node, path, nodeInfo ]);
+  }
 
   return nodeInfo;
 };
\ No newline at end of file
diff --git a/packages/megadoc-plugin-js/lib/Parser/NodeAnalyzer/generateContext.js b/packages/megadoc-plugin-js/lib/Parser/NodeAnalyzer/generateContext.js
deleted file mode 100644
index 3a795425..00000000
--- a/packages/megadoc-plugin-js/lib/Parser/NodeAnalyzer/generateContext.js
+++ /dev/null
@@ -1,77 +0,0 @@
-var K = require('../constants');
-var t = require('babel-types');
-
-module.exports = function generateContext(contextNode) {
-  var ctx;
-
-  if (
-    t.isFunctionExpression(contextNode) ||
-    t.isFunctionDeclaration(contextNode) ||
-    t.isObjectMethod(contextNode)
-  ) {
-    ctx = parseFunctionExpression(contextNode);
-  }
-  else if (t.isVariableDeclarator(contextNode)) {
-    return generateContext(contextNode.init);
-  }
-  else if (t.isVariableDeclaration(contextNode)) {
-    return generateContext(contextNode.declarations[0]);
-  }
-  else if (t.isLiteral(contextNode)) {
-    ctx = parseLiteral(contextNode);
-  }
-  else if (t.isObjectExpression(contextNode)) {
-    ctx = parseObjectExpression(contextNode);
-  }
-  else if (t.isArrayExpression(contextNode)) {
-    ctx = parseArrayExpression(contextNode);
-  }
-  else if (t.isClassDeclaration(contextNode)) {
-    ctx = { type: K.TYPE_CLASS }; // TODO
-  }
-
-  return ctx;
-};
-
-function castExpressionValue(expr) {
-  if (t.isArrayExpression(expr)) {
-    return expr.elements.map(castExpressionValue);
-  }
-  else if (t.isLiteral(expr)) {
-    return expr.value;
-  }
-}
-
-function parseFunctionExpression(node) {
-  var defaults = node.defaults || [];
-
-  return {
-    type: K.TYPE_FUNCTION,
-    params: node.params.map(function(param, i) {
-      return {
-        name: param.name,
-        defaultValue: castExpressionValue(defaults[i])
-      }
-    })
-  };
-}
-
-function parseLiteral(node) {
-  return {
-    type: K.TYPE_LITERAL,
-    value: castExpressionValue(node)
-  };
-}
-
-function parseObjectExpression(/*expr*/) {
-  return {
-    type: K.TYPE_OBJECT,
-    properties: [] // TODO
-  }
-}
-function parseArrayExpression(/*expr*/) {
-  return {
-    type: K.TYPE_ARRAY,
-    values: [] // TODO
-  }
-}
diff --git a/packages/megadoc-plugin-js/lib/Parser/NodeAnalyzer/NodeInfo.js b/packages/megadoc-plugin-js/lib/Parser/NodeAnalyzer__NodeInfo.js
similarity index 95%
rename from packages/megadoc-plugin-js/lib/Parser/NodeAnalyzer/NodeInfo.js
rename to packages/megadoc-plugin-js/lib/Parser/NodeAnalyzer__NodeInfo.js
index 309c1538..8f2b5b93 100644
--- a/packages/megadoc-plugin-js/lib/Parser/NodeAnalyzer/NodeInfo.js
+++ b/packages/megadoc-plugin-js/lib/Parser/NodeAnalyzer__NodeInfo.js
@@ -1,6 +1,6 @@
-var K = require('../constants');
+var K = require('./constants');
 var assign = require('lodash').assign;
-var getLocation = require('../Utils').getLocation;
+var getLocation = require('./ASTUtils').getLocation;
 
 /**
  * @param {recast.ast} node
@@ -27,7 +27,6 @@ function NodeInfo(node, filePath) {
 NodeInfo.prototype.toJSON = function() {
   return {
     id: this.id,
-    ctx: this.ctx,
     receiver: this.receiver,
     loc: this.loc,
   };
diff --git a/packages/megadoc-plugin-js/lib/Parser/NodeAnalyzer/analyzeNode.js b/packages/megadoc-plugin-js/lib/Parser/NodeAnalyzer__analyzeNode.js
similarity index 88%
rename from packages/megadoc-plugin-js/lib/Parser/NodeAnalyzer/analyzeNode.js
rename to packages/megadoc-plugin-js/lib/Parser/NodeAnalyzer__analyzeNode.js
index f840e8ac..0fdaa85a 100644
--- a/packages/megadoc-plugin-js/lib/Parser/NodeAnalyzer/analyzeNode.js
+++ b/packages/megadoc-plugin-js/lib/Parser/NodeAnalyzer__analyzeNode.js
@@ -1,7 +1,7 @@
-var Utils = require('../Utils');
-var NodeInfo = require('./NodeInfo');
-var K = require('../constants');
-var generateContext = require('./generateContext');
+var ASTUtils = require('./ASTUtils');
+var NodeInfo = require('./NodeAnalyzer__NodeInfo');
+var K = require('./constants');
+var generateContext = require('./NodeAnalyzer__generateContext');
 var debuglog = require('megadoc/lib/Logger')('megadoc').info;
 var t = require('babel-types');
 
@@ -36,6 +36,16 @@ function analyzeNode(node, path, filePath, config) {
     info.id = node.id.name;
     info.$contextNode = node;
   }
+  // TODO: when do we reach this? it seems FunctionExpression nodes are only
+  // really valid as an argument to a ReturnStatement, or as an init for a
+  // VariableDeclaration
+  //
+  // Maybe something like this?
+  //
+  //     (
+  //       /** Hello */
+  //       function() {}
+  //     )(this)
   else if (t.isFunctionExpression(node)) {
     info.id = node.id.name;
     info.$contextNode = node;
@@ -62,10 +72,6 @@ function analyzeNode(node, path, filePath, config) {
 
   if (info.id) {
     info.addContextInfo(generateContext(info.$contextNode));
-
-    if (info.isExports() || info.isDestructuredObject()) {
-      info.addContextInfo({ type: K.TYPE_OBJECT });
-    }
   }
 
   return info;
@@ -74,6 +80,7 @@ function analyzeNode(node, path, filePath, config) {
 function analyzeVariableDeclaration(node, path, info) {
   var decl = node.declarations[0];
 
+
   //     var Something = 'a';
   //     var Something = SomeFunc();
   //     var Something = {};
@@ -115,8 +122,9 @@ function analyzeVariableDeclaration(node, path, info) {
   //      * Something.
   //      */
   //     var SomeModule = exports;
-  if (Utils.isExports(node)) {
+  if (ASTUtils.isExports(node)) {
     info.markAsExports();
+    info.addContextInfo({ type: K.TYPE_OBJECT });
   }
 }
 
@@ -133,7 +141,6 @@ function analyzeExpressionStatement(node, path, info, filePath, config) {
     //
     //     SomeModule.foo = 'a';
     if (t.isIdentifier(lhs.object) && t.isIdentifier(lhs.property)) {
-      info.type = 'property';
       info.id = lhs.property.name;
       info.receiver = lhs.object.name;
     }
@@ -163,14 +170,14 @@ function analyzeExpressionStatement(node, path, info, filePath, config) {
     // CommonJS special scenario: a named function assigned to `module.exports`
     //
     //     module.exports = function namedFunction() {};
-    if (Utils.isModuleExports(expr) && t.isIdentifier(rhs.id)) {
+    if (ASTUtils.isModuleExports(expr) && t.isIdentifier(rhs.id)) {
       info.id = rhs.id.name;
     }
     // Unnamed CommonJS module.exports:
     //
     //     module.exports = function() {};
-    else if (Utils.isModuleExports(expr) && config.inferModuleIdFromFileName) {
-      info.id = Utils.getVariableNameFromFilePath(filePath);
+    else if (ASTUtils.isModuleExports(expr) && config.inferModuleIdFromFileName) {
+      info.id = ASTUtils.getVariableNameFromFilePath(filePath);
     }
     // A function assigned to some object property:
     //
@@ -211,7 +218,7 @@ function analyzeExpressionStatement(node, path, info, filePath, config) {
     //     SomeModule.prototype.someFunction = function() {};
     else if (t.isMemberExpression(lhs.object) && t.isIdentifier(lhs.property)) {
       info.id = lhs.property.name;
-      info.receiver = Utils.flattenNodePath(lhs.object);
+      info.receiver = ASTUtils.flattenNodePath(lhs.object);
     }
   }
   else if (t.isMemberExpression(lhs)) {
@@ -233,7 +240,7 @@ function analyzeExpressionStatement(node, path, info, filePath, config) {
     console.info("Unrecognized ExpressionStatement '%s' => '%s' (Source: %s).",
       lhs ? lhs.type : expr.type,
       rhs ? rhs.type : expr.type,
-      Utils.dumpLocation(node, filePath)
+      ASTUtils.dumpLocation(node, filePath)
     );
   }
 }
@@ -247,7 +254,7 @@ function analyzeProperty(node, path, info) {
   //       someFunc: fn // <--
   //     };
   if (t.isIdentifier(node.key) && t.isIdentifier(node.value)) {
-    var identifierPath = Utils.findIdentifierInScope(node.value.name, path);
+    var identifierPath = ASTUtils.findIdentifierInScope(node.value.name, path);
     if (identifierPath) {
       info.id = node.key.name;
       info.$contextNode = identifierPath.parentPath.node;
diff --git a/packages/megadoc-plugin-js/lib/Parser/NodeAnalyzer__generateContext.js b/packages/megadoc-plugin-js/lib/Parser/NodeAnalyzer__generateContext.js
new file mode 100644
index 00000000..7ab5278a
--- /dev/null
+++ b/packages/megadoc-plugin-js/lib/Parser/NodeAnalyzer__generateContext.js
@@ -0,0 +1,99 @@
+var K = require('./constants');
+var t = require('babel-types');
+
+module.exports = parseNode;
+
+function parseNode(contextNode) {
+  if (
+    t.isFunctionExpression(contextNode) ||
+    t.isFunctionDeclaration(contextNode) ||
+    t.isObjectMethod(contextNode)
+  ) {
+    return parseFunctionExpression(contextNode);
+  }
+  else if (t.isVariableDeclarator(contextNode)) {
+    return parseNode(contextNode.init);
+  }
+  else if (t.isVariableDeclaration(contextNode)) {
+    return parseNode(contextNode.declarations[0]);
+  }
+  else if (t.isLiteral(contextNode)) {
+    return parseLiteral(contextNode);
+  }
+  else if (t.isObjectExpression(contextNode)) {
+    return parseObjectExpression(contextNode);
+  }
+  else if (t.isArrayExpression(contextNode)) {
+    return parseArrayExpression(contextNode);
+  }
+  else if (t.isClassDeclaration(contextNode)) {
+    return { type: K.TYPE_CLASS }; // TODO
+  }
+  else if (t.isObjectProperty(contextNode) && t.isIdentifier(contextNode.key)) {
+    return {
+      type: K.OBJECT_PROPERTY,
+      key: contextNode.key.name,
+      value: parseNode(contextNode.value),
+    }
+  }
+};
+
+function parseFunctionExpression(node) {
+  return {
+    type: K.TYPE_FUNCTION,
+    params: node.params.map(function(param) {
+      return parseFunctionParameter(param);
+    })
+  };
+}
+
+function parseLiteral(node) {
+  return {
+    type: K.TYPE_LITERAL,
+    value: node.value
+  };
+}
+
+function parseObjectExpression(expr) {
+  return {
+    type: K.TYPE_OBJECT,
+    properties: expr.properties.map(parseNode)
+  }
+}
+
+function parseArrayExpression(expr) {
+  return {
+    type: K.TYPE_ARRAY,
+    elements: expr.elements.map(parseNode)
+  }
+}
+
+// ESprima seems to annotate FunctionDeclaration nodes with a "defaults" property
+// that is an array of Literal nodes that map to parameter default values,
+// however, babel doesn't seem to do it this way; instead, it's using an
+// AssignmentPattern to reflect the defaults. So for:
+//
+//     function x(a, b = 5) {}
+//
+// We get something like:
+//
+//     [FunctionDeclaration |
+//       params: [Array |
+//         [Node.Identifier],
+//         [Node.AssignmentPattern|
+//           left: Node,
+//           right: Node
+//         ]
+//       ]
+//     ]
+function parseFunctionParameter(node) {
+  if (t.isIdentifier(node)) {
+    return { name: node.name };
+  }
+  else if (t.isAssignmentPattern(node)) {
+    return {
+      name: node.left.name,
+      defaultValue: node.right.value
+    };
+  }
+}
\ No newline at end of file
diff --git a/packages/megadoc-plugin-js/lib/Parser/PostProcessor.js b/packages/megadoc-plugin-js/lib/Parser/PostProcessor.js
deleted file mode 100644
index 4e699f5f..00000000
--- a/packages/megadoc-plugin-js/lib/Parser/PostProcessor.js
+++ /dev/null
@@ -1,213 +0,0 @@
-var path = require('path');
-var K = require('./constants');
-var DocClassifier = require('./DocClassifier');
-var Utils = require('./Utils');
-var debuglog = require('megadoc/lib/Logger')('megadoc').info;
-
-exports.run = function(registry, config) {
-  var docs = registry.docs;
-  var initialCount = docs.length;
-
-  debuglog('Post-processing %d docs.', docs.length);
-
-  if (config.namespaceDirMap) {
-    var namespaceDirMap = Object.keys(config.namespaceDirMap);
-
-    docs.filter(DocClassifier.isModule).forEach(function(doc) {
-      var docstring = doc.docstring;
-      var filePath = doc.filePath;
-
-      if (!docstring.namespace) {
-        var dirName = path.dirname(filePath);
-
-        namespaceDirMap.some(function(pattern) {
-          if (dirName.match(pattern)) {
-            // gotta <3 mutable state.. :)
-            docstring.overrideNamespace(config.namespaceDirMap[pattern]);
-            doc.id = doc.generateId();
-            doc.name = doc.generateName();
-
-            return true;
-          }
-        });
-      }
-    });
-  }
-
-  docs.filter(DocClassifier.isEntity).forEach(function(doc) {
-    resolveReceiver(registry, doc);
-  });
-
-  removeBadDocs(registry);
-
-  docs.filter(DocClassifier.isEntity).forEach(function(doc) {
-    identifyScope(registry, doc);
-  });
-
-  // Remove @lends docs, we don't need them.
-  docs
-    .filter(function(doc) { return doc.docstring.doesLend(); })
-    .forEach(function(doc) {
-      registry.remove(doc);
-    })
-  ;
-
-  warnAboutUnknownContexts(registry);
-
-  debuglog('Post-processing complete. %d/%d docs remain.', docs.length, initialCount);
-};
-
-function identifyScope(registry, doc) {
-  var nodeInfo = doc.nodeInfo;
-
-  if (nodeInfo.isInstanceEntity()) {
-    nodeInfo.ctx.scope = K.SCOPE_INSTANCE;
-  }
-  else if (nodeInfo.isPrototypeEntity()) {
-    nodeInfo.ctx.scope = K.SCOPE_PROTOTYPE;
-  }
-  else if (
-    Utils.isFactoryModuleReturnEntity(
-      doc.$path.node,
-      doc.$path,
-      registry
-    )
-  ) {
-    nodeInfo.ctx.scope = K.SCOPE_FACTORY_EXPORTS;
-  }
-}
-
-function resolveReceiver(registry, doc) {
-  var receiver = doc.nodeInfo.receiver;
-  var actualReceiver;
-
-  // @memberOf support
-  //
-  // Note that this might still need alias-resolving.
-  if (doc.docstring.hasMemberOf()) {
-    receiver = doc.docstring.getExplicitReceiver();
-
-    if (receiver.match(/(.*)\.prototype$/)) {
-      doc.overrideReceiver(RegExp.$1);
-
-      doc.nodeInfo.addContextInfo({
-        scope: K.SCOPE_PROTOTYPE
-      });
-
-      // @method or @type ? we use that instead
-      if (doc.docstring.hasTypeOverride()) {
-        doc.nodeInfo.addContextInfo({
-          type: doc.docstring.getTypeOverride()
-        });
-      }
-
-      // For something like:
-      //
-      //     Object.defineProperty(someObj, 'someProp', {
-      //       /** @memberOf someObj */
-      //       get: function() {
-      //       }
-      //     })
-      //
-      // we don't want the context type to be function, because it isn't
-      else if (doc.docstring.hasTag('property')) {
-        doc.nodeInfo.addContextInfo({
-          type: K.TYPE_UNKNOWN
-        });
-      }
-    }
-    else {
-      doc.overrideReceiver(receiver);
-    }
-  }
-
-  // Resolve @lends
-  var lendEntry = (
-    registry.findAliasedLendTarget(doc.$path, receiver) ||
-    registry.findClosestLend(doc.$path)
-  );
-
-  // TODO: this needs a bit of rethinking really
-  if (lendEntry) {
-    actualReceiver = registry.get(lendEntry.receiver);
-
-    if (actualReceiver) {
-      doc.overrideReceiver(actualReceiver.id);
-
-      if (lendEntry.scope) {
-        doc.nodeInfo.ctx.scope = lendEntry.scope;
-      }
-    }
-  }
-  else {
-    //     var Something = exports;
-    //         ^^^^^^^^^
-    //
-    //     // ...
-    //
-    //     /** yep */
-    //     exports.something = function() {}
-    //     ^^^^^^^
-    if (receiver === 'exports') {
-      actualReceiver = registry.findExportedModule(doc.filePath);
-
-      if (actualReceiver) {
-        doc.overrideReceiver(actualReceiver.id);
-      }
-    }
-    else {
-      // TODO: this too
-      actualReceiver = (
-        registry.findAliasedReceiver(doc.$path, receiver) ||
-        registry.findClosestModule(doc.$path)
-      );
-
-      if (actualReceiver) {
-        doc.overrideReceiver(actualReceiver);
-      }
-    }
-  }
-}
-
-function removeBadDocs(registry) {
-  var badDocs = [];
-
-  registry.docs
-    .filter(function(doc) {
-      return (
-        !doc.isModule() &&
-        (!doc.hasReceiver() || !registry.get(doc.getReceiver()))
-      );
-    })
-    .forEach(function(doc) {
-      console.warn(
-        'Unable to map "%s" to any module, it will be discarded. (Source: %s)',
-        doc.id,
-        doc.nodeInfo.fileLoc
-      );
-
-      badDocs.push(doc);
-    })
-  ;
-
-  badDocs.forEach(function(doc) {
-    registry.remove(doc);
-  });
-
-  badDocs = null;
-}
-
-function warnAboutUnknownContexts(registry) {
-  registry.docs.forEach(function(doc) {
-    var ctx = doc.nodeInfo.ctx;
-
-    if (!ctx.type || ctx.type === K.TYPE_UNKNOWN) {
-      debuglog(
-        'Entity "%s" has no context. This probably means megadoc does not know ' +
-        'how to handle it yet. (Source: %s)',
-        doc.id,
-        doc.nodeInfo.fileLoc
-      );
-    }
-  });
-}
\ No newline at end of file
diff --git a/packages/megadoc-plugin-js/lib/Parser/Registry.js b/packages/megadoc-plugin-js/lib/Parser/Registry.js
index 974e540d..d62d4472 100644
--- a/packages/megadoc-plugin-js/lib/Parser/Registry.js
+++ b/packages/megadoc-plugin-js/lib/Parser/Registry.js
@@ -1,6 +1,6 @@
 var WeakMap = require('weakmap');
-var Utils = require('./Utils');
-var K = require('./constants');
+var ASTUtils = require('./ASTUtils');
+var DocUtils = require('./DocUtils');
 var assert = require('assert');
 
 /**
@@ -28,7 +28,7 @@ Rpt.addModuleDoc = function(doc, path, filePath) {
   if (this.get(doc.id)) {
     console.warn('You are attempting to overwrite an existing doc entry! This is very bad.',
       doc.id,
-      filePath + ':' + Utils.getLocation(path.node).start.line
+      filePath + ':' + ASTUtils.getLocation(path.node).start.line
     );
   }
 
@@ -52,19 +52,11 @@ Rpt.addEntityDoc = function(doc, path) {
 };
 
 Rpt.trackLend = function(lendsTo, path) {
-  var targetPath = Utils.findNearestPathWithComments(path);
+  var targetPath = ASTUtils.findNearestPathWithComments(path);
 
-  if (lendsTo.match(/(.*)\.prototype$/)) {
-    this.lends.set(targetPath, {
-      receiver: RegExp.$1,
-      scope: K.SCOPE_PROTOTYPE
-    });
-  }
-  else {
-    this.lends.set(targetPath, {
-      receiver: lendsTo
-    });
-  }
+  this.lends.set(targetPath, {
+    receiver: lendsTo
+  });
 };
 
 Rpt.remove = function(doc) {
@@ -76,9 +68,20 @@ Rpt.remove = function(doc) {
 
 Rpt.get = function(id, filePath) {
   return this.docs.filter(function(doc) {
-    return (doc.id === id || doc.name === id) && (
-      filePath ? doc.filePath === filePath : true
+    if (filePath && doc.filePath !== filePath) {
+      return false;
+    }
+
+    return (
+      DocUtils.getIdOf(doc) === id ||
+      doc.docstring.hasAlias(id)
     );
+  })[0] || this.docs.filter(function(doc) { // TODO: optimize
+    if (filePath && doc.filePath !== filePath) {
+      return false;
+    }
+
+    return DocUtils.getNameOf(doc) === id;
   })[0];
 };
 
@@ -93,7 +96,7 @@ Rpt.get = function(id, filePath) {
 Rpt.findClosestModule = function(path) {
   var receiverDoc = this.findEnclosingDoc(path, this.docPaths);
 
-  if (receiverDoc && receiverDoc.isModule()) {
+  if (receiverDoc && DocUtils.isModule(receiverDoc)) {
     return receiverDoc.id;
   }
 };
@@ -135,10 +138,10 @@ Rpt.findClosestLend = function(path) {
  * @return {Object} lendEntry
  */
 Rpt.findAliasedLendTarget = function(path, alias) {
-  var identifierPath = Utils.findIdentifierInScope(alias, path);
+  var identifierPath = ASTUtils.findIdentifierInScope(alias, path);
 
   if (identifierPath) {
-    var targetPath = Utils.findNearestPathWithComments(identifierPath);
+    var targetPath = ASTUtils.findNearestPathWithComments(identifierPath);
 
     if (targetPath) {
       return this.lends.get(targetPath);
@@ -150,27 +153,25 @@ Rpt.findAliasedLendTarget = function(path, alias) {
  * @return {String}
  *         The actual/resolved receiver.
  */
-Rpt.findAliasedReceiver = function(path, alias) {
-  var identifierPath = Utils.findIdentifierInScope(alias, path);
+Rpt.findAliasedReceiver = function(alias) {
+  var docs = this.docs.filter(function(doc) {
+    return doc.docstring.hasAlias(alias);
+  });
 
-  if (identifierPath) {
-    var receiverPath = Utils.findNearestPathWithComments(identifierPath);
-
-    if (receiverPath) {
-      var receiverDoc = this.getModuleDocAtPath(receiverPath);
-      if (receiverDoc) {
-        if (receiverDoc.id !== alias) {
-          return receiverDoc.id;
-        }
-      }
-    }
+  if (docs.length > 1) {
+    console.warn("Multiple documents are using the same alias '%s': %s",
+      alias,
+      JSON.stringify(docs.map(function(x) { return x.id; }))
+    );
   }
+
+  return docs[0] && docs[0].id;
 };
 
 Rpt.findEnclosingDoc = function(startingPath, map) {
   var doc;
 
-  Utils.findAncestorPath(startingPath, function(path) {
+  ASTUtils.findAncestorPath(startingPath, function(path) {
     return Boolean(doc = map.get(path));
   });
 
diff --git a/packages/megadoc-plugin-js/lib/Parser/TestUtils.js b/packages/megadoc-plugin-js/lib/Parser/TestUtils.js
index 8172c528..f8fd1543 100644
--- a/packages/megadoc-plugin-js/lib/Parser/TestUtils.js
+++ b/packages/megadoc-plugin-js/lib/Parser/TestUtils.js
@@ -1,16 +1,29 @@
 var multiline = require('multiline-slash');
 var ASTParser = require('./');
 
+exports.parseNode = function(strGenerator, config, filePath) {
+  var parser = new ASTParser();
+  var body = typeof strGenerator === 'function' ? multiline(strGenerator) : strGenerator;
+
+  config = config || {};
+  config.alias = config.alias || {};
+  config.strict = true;
+
+  parser.parseString(body, config, filePath || '__test__');
+
+  return parser.registry.docs;
+}
+
 function parseInline(strGenerator, config, filePath) {
   var parser = new ASTParser();
-  var body = multiline(strGenerator);
+  var body = typeof strGenerator === 'function' ? multiline(strGenerator) : strGenerator;
   var database;
 
   config = config || {};
   config.alias = config.alias || {};
+  config.strict = true;
 
   parser.parseString(body, config, filePath || '__test__');
-  parser.seal(config);
 
   database = parser.toJSON();
 
@@ -31,10 +44,9 @@ function parseFiles(filePaths, config, commonPrefix) {
   config.alias = config.alias || {};
 
   filePaths.forEach(function(filePath) {
-    parser.parseFile(filePath, config || {}, commonPrefix);
+    parser.parseFile(filePath, config || {}, commonPrefix || __dirname);
   });
 
-  parser.seal(config);
   database = parser.toJSON();
 
   if (config.postProcessors) {
diff --git a/packages/megadoc-plugin-js/lib/Parser/__tests__/Docstring.test.js b/packages/megadoc-plugin-js/lib/Parser/__tests__/Docstring.test.js
index dcc99b78..df146916 100644
--- a/packages/megadoc-plugin-js/lib/Parser/__tests__/Docstring.test.js
+++ b/packages/megadoc-plugin-js/lib/Parser/__tests__/Docstring.test.js
@@ -9,9 +9,6 @@ var parse = function(strGenerator, customTags, filePath) {
 };
 
 describe('CJS::Parser::Docstring', function() {
-});
-
-describe('CJS::Parser::Docstring::Tag', function() {
   it('parses inline "description"', function() {
     var docstring = parse(function() {;
       // /**
@@ -25,16 +22,6 @@ describe('CJS::Parser::Docstring::Tag', function() {
   });
 
   describe('@module', function() {
-    it('parses the module path', function() {
-      var docstring = parse(function() {;
-        // /**
-        //  * @module Dragon
-        //  */
-      });
-
-      assert.equal(docstring.id, 'Dragon');
-    });
-
     it('parses "description" and omits the module path from it', function() {
       var docstring = parse(function() {;
         // /**
@@ -66,355 +53,8 @@ describe('CJS::Parser::Docstring::Tag', function() {
         //  */
       });
 
+      assert.equal(docstring.name, 'Dragon');
       assert.equal(docstring.namespace, 'Hairy');
     });
   });
-
-  describe('@property', function() {
-    it('parses a single type', function() {
-      var docstring = parse(function() {;
-        // /**
-        //  * @property {String}
-        //  */
-      });
-
-      assert.equal(docstring.tags.length, 1);
-      assert.deepEqual(docstring.tags[0].typeInfo.types, [ 'String' ]);
-    });
-
-    it('parses multiple types', function() {
-      var docstring = parse(function() {;
-        // /**
-        //  * @property {String|Object}
-        //  */
-      });
-
-      assert.equal(docstring.tags.length, 1);
-      assert.deepEqual(docstring.tags[0].typeInfo.types, [ 'String', 'Object' ]);
-    });
-
-    it('parses the name', function() {
-      var docstring = parse(function() {;
-        // /**
-        //  * @property {String} foo
-        //  */
-      });
-
-      assert.equal(docstring.tags.length, 1);
-      assert.equal(docstring.tags[0].typeInfo.name, 'foo');
-    });
-
-    it('parses an optional property', function() {
-      var docstring = parse(function() {;
-        // /**
-        //  * @property {String} [foo]
-        //  */
-      });
-
-      assert.equal(docstring.tags.length, 1);
-      assert.equal(docstring.tags[0].typeInfo.isOptional, true);
-      assert.equal(docstring.tags[0].typeInfo.name, 'foo');
-    });
-
-    it('parses the default value', function() {
-      var docstring = parse(function() {;
-        // /**
-        //  * @property {String} [foo='bar']
-        //  */
-      });
-
-      assert.equal(docstring.tags.length, 1);
-      assert.equal(docstring.tags[0].typeInfo.defaultValue, "'bar'");
-    });
-
-    it('parses the description', function() {
-      var docstring = parse(function() {;
-        // /**
-        //  * @property {String} foo
-        //  *           Something.
-        //  */
-      });
-
-      assert.equal(docstring.tags.length, 1);
-      assert.equal(docstring.tags[0].typeInfo.description, 'Something.');
-    });
-
-    it('strips leading whitespace from description', function() {
-      var docstring = parse(function() {;
-        // /**
-        //  * @property {String} foo
-        //  *           This
-        //  *           is
-        //  *           a
-        //  *           multiline
-        //  *           description.
-        //  */
-      });
-
-      assert.equal(docstring.tags.length, 1);
-      assert.equal(docstring.tags[0].typeInfo.description,
-        'This\nis\na\nmultiline\ndescription.'
-      );
-    });
-  });
-
-  describe('@return', function() {
-    it('parses a single type', function() {
-      var docstring = parse(function() {;
-        // /**
-        //  * @return {String}
-        //  */
-      });
-
-      assert.equal(docstring.tags.length, 1);
-      assert.deepEqual(docstring.tags[0].typeInfo.types, [ 'String' ]);
-    });
-
-    it('parses multiple types', function() {
-      var docstring = parse(function() {;
-        // /**
-        //  * @return {String|Object}
-        //  */
-      });
-
-      assert.equal(docstring.tags.length, 1);
-      assert.deepEqual(docstring.tags[0].typeInfo.types, [ 'String', 'Object' ]);
-    });
-
-    it('parses the name', function() {
-      var docstring = parse(function() {;
-        // /**
-        //  * @return {String} foo
-        //  */
-      });
-
-      assert.equal(docstring.tags.length, 1);
-      assert.equal(docstring.tags[0].typeInfo.name, 'foo');
-      assert.equal(docstring.tags[0].typeInfo.description, undefined);
-    });
-
-    it('parses the description', function() {
-      var docstring = parse(function() {;
-        // /**
-        //  * @return {String} foo
-        //  *         Something.
-        //  */
-      });
-
-      assert.equal(docstring.tags.length, 1);
-      assert.equal(docstring.tags[0].typeInfo.name, 'foo');
-      assert.equal(docstring.tags[0].typeInfo.description, 'Something.');
-    });
-
-    it('parses the description without a name', function() {
-      var docstring = parse(function() {;
-        // /**
-        //  * @return {String}
-        //  *         Something.
-        //  */
-      });
-
-      assert.equal(docstring.tags.length, 1);
-      assert.equal(docstring.tags[0].typeInfo.name, undefined);
-      assert.equal(docstring.tags[0].typeInfo.description, 'Something.');
-    });
-  });
-
-  describe('custom tag: @live_example', function() {
-    var customTags = {
-      live_example: {
-        withTypeInfo: true
-      }
-    };
-
-    it('parses the example type', function() {
-      var docstring = parse(function() {;
-        // /**
-        //  * @live_example {jsx}
-        //  */
-      }, { customTags: customTags });
-
-      assert.equal(docstring.tags.length, 1);
-      assert.deepEqual(docstring.tags[0].typeInfo.types, [ 'jsx' ]);
-    });
-
-    it('accepts a custom processor', function(done) {
-      parse(function() {;
-        // /**
-        //  * @live_example {jsx}
-        //  */
-      }, {
-        customTags: {
-          live_example: {
-            withTypeInfo: true,
-            process: function(tag) {
-              assert.ok(tag);
-              done();
-            }
-          }
-        }
-      });
-    });
-
-    it('accepts custom attributes', function(done) {
-      parse(function() {;
-        // /**
-        //  * @live_example {jsx}
-        //  */
-      }, {
-        customTags: {
-          live_example: {
-            withTypeInfo: true,
-            attributes: [ 'width' ],
-            process: function(tag) {
-              assert.doesNotThrow(function() {
-                tag.setCustomAttribute('width', 240);
-              });
-
-              done();
-            }
-          }
-        }
-      });
-    });
-
-    it('whines if attempting to write to an unspecified attribute', function(done) {
-      parse(function() {;
-        // /**
-        //  * @live_example {jsx}
-        //  *
-        //  *     <Button />
-        //  */
-      }, {
-        customTags: {
-          live_example: {
-            withTypeInfo: true,
-            process: function(tag) {
-              assert.throws(function() {
-                tag.setCustomAttribute('foo', 'bar');
-              }, /Unrecognized custom attribute/);
-
-              done();
-            }
-          }
-        }
-      });
-    });
-
-    it('serializes custom attributes', function() {
-      var docstring = parse(function() {;
-        // /**
-        //  * @live_example {jsx}
-        //  */
-      }, {
-        customTags: {
-          live_example: {
-            withTypeInfo: true,
-            attributes: [ 'width' ],
-            process: function(tag) {
-              tag.setCustomAttribute('width', 240);
-            }
-          }
-        }
-      });
-
-      assert.equal(docstring.toJSON().tags[0].width, 240);
-    });
-  });
-
-  describe('neutralizing whitespace', function() {
-    it('sample 1: an example with a name and code body', function() {
-      var docstring = parse(function() {;
-        // /**
-        //  * @example A child screen
-        //  *
-        //  *     module.exports = {
-        //  *       name: 'author.user',
-        //  *       path: ':userId',
-        //  *       parent: 'author.users'
-        //  *     };
-        //  *
-        //  *     // visitable at "/author/users/1" or "/author/users/:userId"
-        //  *
-        //  */
-      });
-
-      assert.equal(docstring.tags.length, 1);
-
-      assert.equal(docstring.tags[0].typeInfo.name, 'A child screen');
-      assert.deepEqual(docstring.tags[0].typeInfo.description, [
-        "    module.exports = {",
-        "      name: 'author.user',",
-        "      path: ':userId',",
-        "      parent: 'author.users'",
-        "    };",
-        "",
-        "    // visitable at \"/author/users/1\" or \"/author/users/:userId\"",
-      ].join('\n'));
-    });
-
-    it('sample 2: with no name', function() {
-      var docstring = parse(function() {;
-        // /**
-        //  * @example
-        //  *
-        //  * A child screen.
-        //  *
-        //  *     module.exports = {
-        //  *       name: 'author.user',
-        //  *       path: ':userId',
-        //  *       parent: 'author.users'
-        //  *     };
-        //  *
-        //  *     // visitable at "/author/users/1" or "/author/users/:userId"
-        //  *
-        //  */
-      });
-
-      assert.equal(docstring.tags.length, 1);
-
-      assert.equal(docstring.tags[0].typeInfo.name, null);
-      assert.deepEqual(docstring.tags[0].typeInfo.description, [
-        "A child screen.",
-        "",
-        "    module.exports = {",
-        "      name: 'author.user',",
-        "      path: ':userId',",
-        "      parent: 'author.users'",
-        "    };",
-        "",
-        "    // visitable at \"/author/users/1\" or \"/author/users/:userId\"",
-      ].join('\n'));
-    });
-
-    it('sample 3: example with code only', function() {
-      var docstring = parse(function() {;
-        // /**
-        //  * @example
-        //  *
-        //  *     module.exports = {
-        //  *       name: 'author.user',
-        //  *       path: ':userId',
-        //  *       parent: 'author.users'
-        //  *     };
-        //  *
-        //  *     // visitable at "/author/users/1" or "/author/users/:userId"
-        //  *
-        //  */
-      });
-
-      assert.equal(docstring.tags.length, 1);
-
-      assert.equal(docstring.tags[0].typeInfo.name, null);
-      assert.deepEqual(docstring.tags[0].typeInfo.description, [
-        "    module.exports = {",
-        "      name: 'author.user',",
-        "      path: ':userId',",
-        "      parent: 'author.users'",
-        "    };",
-        "",
-        "    // visitable at \"/author/users/1\" or \"/author/users/:userId\"",
-      ].join('\n'));
-    });
-  });
 });
\ No newline at end of file
diff --git a/packages/megadoc-plugin-js/lib/Parser/__tests__/Docstring__Tag.test.js b/packages/megadoc-plugin-js/lib/Parser/__tests__/Docstring__Tag.test.js
new file mode 100644
index 00000000..ac38c1ba
--- /dev/null
+++ b/packages/megadoc-plugin-js/lib/Parser/__tests__/Docstring__Tag.test.js
@@ -0,0 +1,438 @@
+var Tag = require('../Docstring__Tag');
+// var dox = require('dox');
+// var commentParser = require('comment-parser/parser.js');
+var commentParser = require('../parseComment');
+var assert = require('chai').assert;
+var multiline = require('multiline-slash');
+
+var parse = function(strGenerator, options, filePath) {
+  var comment = typeof strGenerator === 'function' ? multiline(strGenerator) : strGenerator;
+  var node = commentParser(comment);
+
+  return new Tag(node[0].tags[0], options || {}, filePath);
+};
+
+describe('CJS::Parser::Docstring::Tag', function() {
+  it('parses inline "description"', function() {
+    var tag = parse(function() {;
+      // /**
+      //  * @param {String} name this is a description
+      //  */
+    });
+
+    assert.equal(tag.typeInfo.name, 'name');
+    assert.equal(tag.typeInfo.description, 'this is a description');
+  });
+
+  describe('@module', function() {
+    it('parses the module path', function() {
+      var tag = parse(function() {;
+        // /**
+        //  * @module Dragon
+        //  */
+      });
+
+      assert.equal(tag.typeInfo.name, 'Dragon');
+    });
+
+    it('parses the module path with a namespace', function() {
+      var tag = parse(function() {;
+        // /**
+        //  * @module NS.Dragon
+        //  */
+      });
+
+      assert.equal(tag.typeInfo.name, 'NS.Dragon');
+    });
+  });
+
+  describe('@namespace', function() {
+    it('parses', function() {
+      var tag = parse(function() {;
+        // /**
+        //  * @namespace Hairy
+        //  */
+      });
+
+      assert.equal(tag.typeInfo.name, 'Hairy');
+    });
+
+    it('parses an inline namespace in a @module path', function() {
+      var tag = parse(function() {;
+        // /**
+        //  * @module Hairy.Dragon
+        //  */
+      });
+
+      assert.equal(tag.typeInfo.name, 'Hairy.Dragon');
+    });
+  });
+
+  describe('@property', function() {
+    it('parses a single type', function() {
+      var tag = parse(function() {;
+        // /**
+        //  * @property {String}
+        //  */
+      });
+
+      assert.include(tag.typeInfo.type, { name: 'String' });
+    });
+
+    it('parses multiple types', function() {
+      var tag = parse(function() {;
+        // /**
+        //  * @property {String|Object}
+        //  */
+      });
+
+      assert.include(tag.typeInfo.type, { name: 'Union' });
+    });
+
+    it('parses the name', function() {
+      var tag = parse(function() {;
+        // /**
+        //  * @property {String} foo
+        //  */
+      });
+
+      assert.equal(tag.typeInfo.name, 'foo');
+      assert.include(tag.typeInfo.type, { name: 'String' });
+    });
+
+    it('parses an optional property', function() {
+      var tag = parse(function() {;
+        // /**
+        //  * @property {String} [foo]
+        //  */
+      });
+
+      assert.equal(tag.typeInfo.isOptional, true);
+      assert.equal(tag.typeInfo.name, 'foo');
+    });
+
+    describe('defaultValue', function() {
+      [
+        { string: "foo", returnValue: null },
+        { string: "[foo]", defaultValue: null },
+        { string: "[foo='bar']", defaultValue: "bar" },
+        { string: "[foo=\"bar\"]", defaultValue: "bar" },
+        { string: "[foo={}]", defaultValue: "{}" },
+        { string: "[foo={ a: 'bar' }]", defaultValue: "{ a: 'bar' }" },
+        { string: "[foo=null]", defaultValue: "null" },
+        { string: "[foo=5]", defaultValue: "5" },
+        { string: "[foo=5.21]", defaultValue: "5.21" },
+        { string: "[foo=[]]", defaultValue: "[]" },
+        { string: "[foo=['a']]", defaultValue: "['a']" },
+        { string: "[ foo = [\"a\"] ]", defaultValue: " [\"a\"] " },
+        { string: "[foo = ]]", error: 'Invalid `name`, unpaired brackets' },
+        { string: "[foo = []", error: 'Invalid `name`, unpaired brackets' },
+      ].forEach(function(sample) {
+        it('parses a default value of "' + sample.defaultValue + '" => "' + sample.defaultValue + '"', function() {
+          var docstring = '/** @property {Mixed} ' + sample.string + ' */'
+
+          if (sample.error) {
+            assert.throws(function() {
+              parse(docstring);
+            }, sample.error);
+          }
+          else {
+            var tag = parse(docstring);
+
+            assert.equal(tag.typeInfo.name, 'foo');
+            assert.equal(tag.typeInfo.defaultValue, sample.defaultValue);
+          }
+        });
+      });
+    });
+
+    it('parses the description', function() {
+      var tag = parse(function() {;
+        // /**
+        //  * @property {String} foo
+        //  *           Something.
+        //  */
+      });
+
+      assert.equal(tag.typeInfo.description, 'Something.');
+    });
+
+    it('strips leading whitespace from description', function() {
+      var tag = parse(function() {;
+        // /**
+        //  * @property {String} foo
+        //  *           This
+        //  *           is
+        //  *           a
+        //  *           multiline
+        //  *           description.
+        //  */
+      });
+
+      assert.equal(tag.typeInfo.description,
+        'This\nis\na\nmultiline\ndescription.'
+      );
+    });
+  });
+
+  describe('@return', function() {
+    it('parses a single type', function() {
+      var tag = parse(function() {;
+        // /**
+        //  * @return {String}
+        //  */
+      });
+
+      assert.include(tag.typeInfo.type, { name: 'String' });
+    });
+
+    it('parses multiple types', function() {
+      var tag = parse(function() {;
+        // /**
+        //  * @return {String|Object}
+        //  */
+      });
+
+      assert.include(tag.typeInfo.type, { name: 'Union' });
+    });
+
+    it('parses the name', function() {
+      var tag = parse(function() {;
+        // /**
+        //  * @return {String} foo
+        //  */
+      });
+
+      assert.equal(tag.typeInfo.name, 'foo');
+      assert.equal(tag.typeInfo.description, undefined);
+    });
+
+    it('parses name and description', function() {
+      var tag = parse(function() {;
+        // /**
+        //  * @return {String} foo
+        //  *         Something.
+        //  */
+      });
+
+      assert.equal(tag.typeInfo.name, 'foo');
+      assert.equal(tag.typeInfo.description, 'Something.');
+    });
+
+    it('parses description without a name', function() {
+      var tag = parse(function() {;
+        // /**
+        //  * @return {String}
+        //  *         Something.
+        //  */
+      });
+
+      assert.equal(tag.typeInfo.name, undefined);
+      assert.equal(tag.typeInfo.description, 'Something.');
+    });
+
+    it('parses inline description without a name', function() {
+      var tag = parse(function() {;
+        // /**
+        //  * @return {true} If the record is valid.
+        //  */
+      }, { namedReturnTags: false });
+
+      assert.equal(tag.typeInfo.name, undefined);
+      assert.equal(tag.typeInfo.description, 'If the record is valid.');
+    });
+  });
+
+  describe('custom tag: @live_example', function() {
+    var customTags = {
+      live_example: {
+        withTypeInfo: true
+      }
+    };
+
+    it('parses the example type', function() {
+      var tag = parse(function() {;
+        // /**
+        //  * @live_example {jsx}
+        //  */
+      }, { customTags: customTags });
+
+      assert.include(tag.typeInfo.type, { name: 'jsx' });
+    });
+
+    it('accepts a custom processor', function(done) {
+      parse(function() {;
+        // /**
+        //  * @live_example {jsx}
+        //  */
+      }, {
+        customTags: {
+          live_example: {
+            withTypeInfo: true,
+            process: function(tag) {
+              assert.ok(tag);
+              done();
+            }
+          }
+        }
+      });
+    });
+
+    it('accepts custom attributes', function(done) {
+      parse(function() {;
+        // /**
+        //  * @live_example {jsx}
+        //  */
+      }, {
+        customTags: {
+          live_example: {
+            withTypeInfo: true,
+            attributes: [ 'width' ],
+            process: function(tag) {
+              assert.doesNotThrow(function() {
+                tag.setCustomAttribute('width', 240);
+              });
+
+              done();
+            }
+          }
+        }
+      });
+    });
+
+    it('whines if attempting to write to an unspecified attribute', function(done) {
+      parse(function() {;
+        // /**
+        //  * @live_example {jsx}
+        //  *
+        //  *     <Button />
+        //  */
+      }, {
+        customTags: {
+          live_example: {
+            withTypeInfo: true,
+            process: function(tag) {
+              assert.throws(function() {
+                tag.setCustomAttribute('foo', 'bar');
+              }, /Unrecognized custom attribute/);
+
+              done();
+            }
+          }
+        }
+      });
+    });
+
+    it('serializes custom attributes', function() {
+      var tag = parse(function() {;
+        // /**
+        //  * @live_example {jsx}
+        //  */
+      }, {
+        customTags: {
+          live_example: {
+            withTypeInfo: true,
+            attributes: [ 'width' ],
+            process: function(x) {
+              x.setCustomAttribute('width', 240);
+            }
+          }
+        }
+      });
+
+      assert.equal(tag.toJSON().width, 240);
+    });
+  });
+
+  describe('neutralizing whitespace', function() {
+    it.skip('sample 1: an example with a name and code body', function() {
+      var tag = parse(function() {;
+        // /**
+        //  * @example A child screen
+        //  *
+        //  *     module.exports = {
+        //  *       name: 'author.user',
+        //  *       path: ':userId',
+        //  *       parent: 'author.users'
+        //  *     };
+        //  *
+        //  *     // visitable at "/author/users/1" or "/author/users/:userId"
+        //  *
+        //  */
+      });
+
+      assert.equal(tag.typeInfo.name, 'A child screen');
+      assert.deepEqual(tag.typeInfo.description, [
+        "    module.exports = {",
+        "      name: 'author.user',",
+        "      path: ':userId',",
+        "      parent: 'author.users'",
+        "    };",
+        "",
+        "    // visitable at \"/author/users/1\" or \"/author/users/:userId\"",
+      ].join('\n'));
+    });
+
+    it('sample 2: with no name', function() {
+      var tag = parse(function() {;
+        // /**
+        //  * @example
+        //  *
+        //  * A child screen.
+        //  *
+        //  *     module.exports = {
+        //  *       name: 'author.user',
+        //  *       path: ':userId',
+        //  *       parent: 'author.users'
+        //  *     };
+        //  *
+        //  *     // visitable at "/author/users/1" or "/author/users/:userId"
+        //  */
+      });
+
+
+      assert.equal(tag.typeInfo.name, null);
+      assert.deepEqual(tag.typeInfo.description, [
+        // "",
+        "A child screen.",
+        "",
+        "    module.exports = {",
+        "      name: 'author.user',",
+        "      path: ':userId',",
+        "      parent: 'author.users'",
+        "    };",
+        "",
+        "    // visitable at \"/author/users/1\" or \"/author/users/:userId\"",
+        // "",
+      ].join('\n'));
+    });
+
+    it('sample 3: example with code only', function() {
+      var tag = parse(function() {;
+        // /**
+        //  * @example
+        //  *     module.exports = {
+        //  *       name: 'author.user',
+        //  *       path: ':userId',
+        //  *       parent: 'author.users'
+        //  *     };
+        //  *
+        //  *     // visitable at "/author/users/1" or "/author/users/:userId"
+        //  */
+      });
+
+
+      assert.equal(tag.typeInfo.name, null);
+      assert.deepEqual(tag.typeInfo.description, [
+        "    module.exports = {",
+        "      name: 'author.user',",
+        "      path: ':userId',",
+        "      parent: 'author.users'",
+        "    };",
+        "",
+        "    // visitable at \"/author/users/1\" or \"/author/users/:userId\"",
+        // ""
+      ].join('\n'));
+    });
+  });
+});
\ No newline at end of file
diff --git a/packages/megadoc-plugin-js/lib/Parser/__tests__/Docstring__parseTypeString.test.js b/packages/megadoc-plugin-js/lib/Parser/__tests__/Docstring__parseTypeString.test.js
new file mode 100644
index 00000000..75d1c1ab
--- /dev/null
+++ b/packages/megadoc-plugin-js/lib/Parser/__tests__/Docstring__parseTypeString.test.js
@@ -0,0 +1,294 @@
+var subject = require('../Docstring__parseTypeString');
+var assert = require('chai').assert;
+
+describe('CJS::Parser::Docstring::Tag::parseTypeString', function() {
+  [
+    {
+      sample: 'Simple type',
+      string: 'String',
+      types: [
+        { name: 'String' }
+      ]
+    },
+
+    {
+      sample: 'JSDoc-style union type',
+      string: 'String|number',
+      types: [
+        {
+          name: 'Union',
+          elements: [
+            { name: 'String' },
+            { name: 'number' },
+          ]
+        }
+      ]
+    },
+
+    {
+      sample: 'Closure-style non-nullable type (variant 1)',
+      string: '!boolean',
+      types: [
+        { name: 'boolean', nullable: false },
+      ]
+    },
+
+    {
+      sample: 'Closure-style non-nullable type (variant 2)',
+      string: 'boolean!',
+      types: [
+        { name: 'boolean', nullable: false },
+      ]
+    },
+
+    {
+      sample: 'Closure-style nullable type (variant 1)',
+      string: 'String?',
+      types: [
+        { name: 'String', nullable: true }
+      ]
+    },
+    {
+      sample: 'Closure-style nullable type (variant 2)',
+      string: '?String',
+      types: [
+        { name: 'String', nullable: true }
+      ]
+    },
+    {
+      sample: 'Closure-style optional type (variant 1)',
+      string: 'String=',
+      types: [
+        { name: 'String', optional: true }
+      ]
+    },
+    {
+      sample: 'Closure-style optional type (erratic)',
+      string: '=String',
+      error: true
+    },
+    {
+      sample: 'JSDoc-style array',
+      string: 'String[]',
+      types: [
+        { name: 'Array', elements: [{ name: 'String' }] },
+      ]
+    },
+    {
+      sample: 'Closure-style array',
+      string: 'Array.<String>',
+      types: [
+        { name: 'Array', elements: [{ name: 'String' }] },
+      ]
+    },
+    {
+      sample: 'Closure-style array (without dot)',
+      string: 'Array<String>',
+      types: [
+        { name: 'Array', elements: [{ name: 'String' }] },
+      ]
+    },
+
+    {
+      sample: 'Closure-style array with nullable element',
+      string: 'Array<String?>',
+      types: [
+        { name: 'Array', elements: [{ name: 'String', nullable: true }] },
+      ]
+    },
+    {
+      sample: 'Closure-style array with non-nullable element',
+      string: 'Array<String!>',
+      types: [
+        { name: 'Array', elements: [{ name: 'String', nullable: false }] },
+      ]
+    },
+
+    {
+      sample: 'Closure-style array with multiple elements',
+      string: 'Array<String, Object>',
+      types: [
+        { name: 'Array', elements: [{ name: 'String' }, { name: 'Object' }] },
+      ]
+    },
+
+    {
+      sample: 'Closure-style object with key/value types',
+      string: 'Object<String, Object>',
+      types: [
+        { name: 'Object', elements: [{ name: 'String' }, { name: 'Object' }] },
+      ]
+    },
+
+    {
+      sample: 'Closure-style literal objects',
+      string: '{ name: String, value: Number }',
+      types: [
+        {
+          name: 'Object',
+          elements: [
+            {
+              name: 'ObjectProperty',
+              key: { name: 'name' },
+              value: { name: 'String' }
+            },
+            {
+              name: 'ObjectProperty',
+              key: { name: 'value' },
+              value: { name: 'Number' }
+            }
+          ]
+        },
+      ]
+    },
+
+    {
+      sample: 'Array of literal objects',
+      string: 'Array.<{ name: String, value: Number }>',
+      types: [
+        {
+          name: 'Array',
+          elements: [
+            {
+              name: 'Object',
+              elements: [
+                {
+                  name: 'ObjectProperty',
+                  key: { name: 'name' },
+                  value: { name: 'String' }
+                },
+                {
+                  name: 'ObjectProperty',
+                  key: { name: 'value' },
+                  value: { name: 'Number' }
+                }
+              ]
+            }
+          ]
+        },
+      ]
+    },
+
+    {
+      sample: 'Closure-style unions',
+      string: '(number|boolean)',
+      types: [
+        { name: 'Union', elements: [{ name: 'number' }, { name: 'boolean' }] },
+      ]
+    },
+
+    {
+      sample: 'Closure-style unions with nullable elements',
+      string: '(number|?boolean)',
+      types: [
+        { name: 'Union', elements: [{ name: 'number' }, { name: 'boolean', nullable: true }] },
+      ]
+    },
+    {
+      sample: 'Closure-style unions with required elements',
+      string: '(number|!boolean)',
+      types: [
+        { name: 'Union', elements: [{ name: 'number' }, { name: 'boolean', nullable: false }] },
+      ]
+    },
+    {
+      sample: 'A function literal with no parameters',
+      string: 'function',
+      types: [
+        { name: 'Function' },
+      ]
+    },
+    {
+      sample: 'A function literal with a single parameter',
+      string: 'function(string)',
+      types: [
+        { name: 'Function', params: [{ name: 'string' }] },
+      ]
+    },
+    {
+      sample: 'A function literal with a spread parameter',
+      string: 'function(String, ...Number)',
+      types: [
+        {
+          name: 'Function',
+          params: [
+            { name: 'String', },
+            { name: 'Number', repeatable: true },
+          ]
+        },
+      ]
+    },
+    {
+      sample: 'A function literal with a return type',
+      string: 'function(): Number',
+      types: [
+        {
+          name: 'Function',
+          returnType: {
+            name: 'Number'
+          }
+        },
+      ]
+    },
+    {
+      sample: 'A function literal with a complexreturn type',
+      string: 'function(): (String|Number|void)',
+      types: [
+        {
+          name: 'Function',
+          returnType: {
+            name: 'Union',
+            elements: [
+              { name: 'String' },
+              { name: 'Number' },
+              { name: 'void' },
+            ]
+          }
+        },
+      ]
+    },
+    {
+      sample: 'A callback type',
+      string: 'My~Callback',
+      types: [
+        {
+          name: 'My~Callback',
+        }
+      ]
+    },
+    {
+      sample: 'Closure-style "all" type',
+      string: '*',
+      types: [
+        {
+          name: 'AllLiteral',
+        }
+      ]
+    },
+    {
+      sample: 'Closure-style "unknown" type',
+      string: '?',
+      types: [
+        {
+          name: 'UnknownLiteral',
+        }
+      ]
+    },
+  ].forEach(function(spec) {
+    var fn = spec.only ? it.only : it;
+    fn((spec.sample || '') +  " ('" + spec.string + "')", function() {
+      if (spec.error) {
+        assert.throws(function() {
+          subject(spec.string)
+        }, typeof spec.error === 'string' ? spec.error : undefined);
+
+        return;
+      }
+
+      assert.equal(
+        JSON.stringify(subject(spec.string)),
+        JSON.stringify(spec.types[0])
+      );
+    });
+  });
+});
\ No newline at end of file
diff --git a/packages/megadoc-plugin-js/lib/Parser/__tests__/NodeAnalyzer__generateContext.test.js b/packages/megadoc-plugin-js/lib/Parser/__tests__/NodeAnalyzer__generateContext.test.js
new file mode 100644
index 00000000..605ef64f
--- /dev/null
+++ b/packages/megadoc-plugin-js/lib/Parser/__tests__/NodeAnalyzer__generateContext.test.js
@@ -0,0 +1,90 @@
+var assert = require('chai').assert;
+var parseNode = require('../TestUtils').parseNode;
+var K = require('../constants');
+
+function parse(strGenerator) {
+  return parseNode(strGenerator)[0].nodeInfo.ctx;
+}
+
+describe('CJS::Parser::NodeAnalyzer::generateContext', function() {
+  describe('for literals...', function() {
+    it('slaps the node value as "nodeValue" for use in place of defaultValue when needed', function() {
+      var subject = parse(function() {;
+        // /**
+        //  */
+        //  var x = 'hello';
+      });
+
+      assert.equal(subject.type, K.TYPE_LITERAL);
+      assert.equal(subject.value, 'hello');
+    });
+  });
+
+  describe('for objects...', function() {
+    it('extracts the properties', function() {
+      var subject = parse(function() {;
+        // /**
+        //  */
+        //  var x = { foo: "bar" };
+      });
+
+      assert.equal(subject.type, K.TYPE_OBJECT);
+      assert.equal(subject.properties.length, 1);
+      assert.equal(subject.properties[0].key, 'foo');
+      assert.include(subject.properties[0].value, { type: K.TYPE_LITERAL, value: 'bar' });
+
+      console.log(subject)
+    });
+  });
+
+  describe('for arrays...', function() {
+    it('slaps the node value as "nodeValue" for use in place of defaultValue when needed', function() {
+      var subject = parse(function() {;
+        // /**
+        //  */
+        //  var x = [ 'hello', 3, { foo: "bar" } ];
+      });
+
+      assert.equal(subject.type, K.TYPE_ARRAY);
+      assert.include(subject.elements[0], { type: 'Literal', value: 'hello' });
+      assert.include(subject.elements[1], { type: 'Literal', value: 3 });
+      assert.include(subject.elements[2], { type: 'Object' });
+    });
+  });
+
+  describe('for functions...', function() {
+    it('uses a parameter name from the comment if it is present', function() {
+      var subject = parse(function() {;
+        // /**
+        //  */
+        //  function x(name) {}
+      });
+
+      assert.ok(subject.params);
+      assert.include(subject.params[0], { name: 'name' });
+    });
+
+    it('warns if param name is missing and there is a count mismatch', function() {
+      var subject = parse(function() {;
+        // /**
+        //  */
+        // function x(x, y) {}
+      });
+
+      assert.include(subject.params[0], { name: 'x' });
+      assert.include(subject.params[1], { name: 'y' });
+    });
+
+    it('uses parameter node info only when the names match (not by index)', function() {
+      var subject = parse(function() {;
+        // /**
+        //  */
+        //  function Foo(x, y = 5) {}
+      });
+
+      assert.ok(subject.params);
+      assert.include(subject.params[0], { name: 'x' });
+      assert.include(subject.params[1], { name: 'y', defaultValue: 5 });
+    });
+  });
+});
\ No newline at end of file
diff --git a/packages/megadoc-plugin-js/lib/Parser/__tests__/Utils.test.js b/packages/megadoc-plugin-js/lib/Parser/__tests__/Utils.test.js
index 4004c967..c68f250d 100644
--- a/packages/megadoc-plugin-js/lib/Parser/__tests__/Utils.test.js
+++ b/packages/megadoc-plugin-js/lib/Parser/__tests__/Utils.test.js
@@ -1,10 +1,10 @@
-var Utils = require('../Utils');
+var Subject = require('../ASTUtils');
 var assert = require('chai').assert;
 var multiline = require('multiline-slash');
 var babel = require('babel-core');
 var t = require('babel-types');
 
-describe('CJS::Parser::Utils', function() {
+describe('CJS::Parser::ASTUtils', function() {
   function parse(strGenerator) {
     return babel.transform(multiline(strGenerator), {
       code: false,
@@ -20,7 +20,7 @@ describe('CJS::Parser::Utils', function() {
 
       babel.traverse(ast, {
         MemberExpression: function(path) {
-          assert.equal(Utils.flattenNodePath(path.node), 'SomeModule.prototype');
+          assert.equal(Subject.flattenNodePath(path.node), 'SomeModule.prototype');
           return false;
         }
       });
@@ -33,7 +33,7 @@ describe('CJS::Parser::Utils', function() {
 
       babel.traverse(ast, {
         MemberExpression: function(path) {
-          assert.equal(Utils.flattenNodePath(path.node), 'SomeModule.prototype');
+          assert.equal(Subject.flattenNodePath(path.node), 'SomeModule.prototype');
           return false;
         }
       });
@@ -52,7 +52,7 @@ describe('CJS::Parser::Utils', function() {
 
       babel.traverse(ast, {
         Property: function(path) {
-          var ancestorPath = Utils.findAncestorPath(path, function(parentPath) {
+          var ancestorPath = Subject.findAncestorPath(path, function(parentPath) {
             return (
               parentPath.node &&
               t.isFunctionDeclaration(parentPath.node)
@@ -78,7 +78,7 @@ describe('CJS::Parser::Utils', function() {
 
       babel.traverse(ast, {
         MemberExpression: function(path) {
-          var ancestorPath = Utils.findAncestorPath(path, function(parentPath) {
+          var ancestorPath = Subject.findAncestorPath(path, function(parentPath) {
             return (
               parentPath.node &&
               t.isFunctionDeclaration(parentPath.node)
@@ -107,7 +107,7 @@ describe('CJS::Parser::Utils', function() {
 
       babel.traverse(ast, {
         Property: function(path) {
-          var targetPath = Utils.findIdentifierInScope(
+          var targetPath = Subject.findIdentifierInScope(
             path.node.value.name,
             path
           );
diff --git a/packages/megadoc-plugin-js/lib/Parser/__tests__/features/@alias.test.js b/packages/megadoc-plugin-js/lib/Parser/__tests__/features/@alias.test.js
new file mode 100644
index 00000000..4e748204
--- /dev/null
+++ b/packages/megadoc-plugin-js/lib/Parser/__tests__/features/@alias.test.js
@@ -0,0 +1,37 @@
+var assert = require('chai').assert;
+var TestUtils = require('../../TestUtils');
+
+describe('CJS::Parser - @alias support', function() {
+  it('accepts the alias', function() {
+    var docs = TestUtils.parseInline(function() {;
+      // /**
+      //  * @module
+      //  * @alias Foo
+      //  */
+      // var DragonHunter = {};
+    });
+
+    assert.equal(docs.length, 1);
+    assert.equal(docs[0].name, 'DragonHunter');
+    assert.include(docs[0].aliases, 'Foo');
+  });
+
+  it('rewrites @memberOf that points to an alias', function() {
+    var docs = TestUtils.parseInline(function() {;
+      // /**
+      //  * @module
+      //  * @alias Foo
+      //  */
+      // var DragonHunter = {};
+      //
+      // /**
+      //  * @memberOf Foo
+      //  */
+      // var something = '5';
+    });
+
+    assert.equal(docs.length, 2);
+    assert.equal(docs[1].name, 'something');
+    assert.equal(docs[1].receiver, 'DragonHunter');
+  });
+});
diff --git a/packages/megadoc-plugin-js/lib/Parser/__tests__/features/@lends.test.js b/packages/megadoc-plugin-js/lib/Parser/__tests__/features/@lends.test.js
index 43915f93..64aba36a 100644
--- a/packages/megadoc-plugin-js/lib/Parser/__tests__/features/@lends.test.js
+++ b/packages/megadoc-plugin-js/lib/Parser/__tests__/features/@lends.test.js
@@ -35,7 +35,7 @@ describe('CJS::Parser - @lends support', function() {
 
     get('DOMHelpers', function(doc) {
       assert.equal(doc.isModule, true);
-      assert.equal(doc.ctx.type, 'object');
+      assert.equal(doc.type, K.TYPE_OBJECT);
     });
 
     get('DOMHelpers.findAll', function(doc) {
@@ -62,10 +62,10 @@ describe('CJS::Parser - @lends support', function() {
     });
 
     assert.equal(docs.length, 2);
-    assert.equal(docs[1].ctx.type, 'literal');
+    assert.equal(docs[1].type, K.TYPE_LITERAL);
     assert.equal(docs[1].name, 'someProperty');
     assert.equal(docs[1].receiver, 'DragonHunter');
-    assert.equal(docs[1].ctx.value, 'a');
+    assert.equal(docs[1].nodeInfo.value, 'a');
   });
 
   it('correctly resolves a namespaced module', function() {
@@ -86,10 +86,10 @@ describe('CJS::Parser - @lends support', function() {
     });
 
     assert.equal(docs.length, 2);
-    assert.equal(docs[1].ctx.type, 'literal');
+    assert.equal(docs[1].type, K.TYPE_LITERAL);
     assert.equal(docs[1].name, 'someProperty');
     assert.equal(docs[1].receiver, 'API.DragonHunter');
-    assert.equal(docs[1].ctx.value, 'a');
+    assert.equal(docs[1].nodeInfo.value, 'a');
   });
 
   it('lends to a prototype', function() {
@@ -111,10 +111,10 @@ describe('CJS::Parser - @lends support', function() {
     assert.equal(docs.length, 3);
     assert.equal(docs[1].name, 'someProperty');
     assert.equal(docs[1].receiver, 'DragonHunter');
-    assert.equal(docs[1].ctx.scope, K.SCOPE_PROTOTYPE);
+    assert.equal(docs[1].nodeInfo.scope, K.SCOPE_PROTOTYPE);
 
     assert.equal(docs[2].name, 'someMethod');
     assert.equal(docs[2].receiver, 'DragonHunter');
-    assert.equal(docs[2].ctx.scope, K.SCOPE_PROTOTYPE);
+    assert.equal(docs[2].nodeInfo.scope, K.SCOPE_PROTOTYPE);
   });
 });
diff --git a/packages/megadoc-plugin-js/lib/Parser/__tests__/features/@memberOf.test.js b/packages/megadoc-plugin-js/lib/Parser/__tests__/features/@memberOf.test.js
index 42592ca9..97499794 100644
--- a/packages/megadoc-plugin-js/lib/Parser/__tests__/features/@memberOf.test.js
+++ b/packages/megadoc-plugin-js/lib/Parser/__tests__/features/@memberOf.test.js
@@ -17,25 +17,97 @@ describe('CJS::Parser - @memberOf support', function() {
     });
 
     assert.equal(docs.length, 2);
-    assert.equal(docs[1].ctx.type, K.TYPE_FUNCTION);
+    assert.equal(docs[1].type, K.TYPE_FUNCTION);
     assert.equal(docs[1].name, 'capture');
     assert.equal(docs[1].receiver, 'DragonHunter');
   });
 
-  it('works with a Something.prototype', function() {
+  it('resolves the correct module even if it is namespaced and the tag omits it', function() {
     var docs = TestUtils.parseInline(function() {;
-      // /** @module */
+      // /**
+      //  * @module
+      //  * @namespace API
+      //  */
       // var DragonHunter = {};
       //
-      // /** @memberOf DragonHunter.prototype */
+      // /** @memberOf DragonHunter */
       // function capture() {}
     });
 
     assert.equal(docs.length, 2);
+    assert.equal(docs[1].type, K.TYPE_FUNCTION);
     assert.equal(docs[1].name, 'capture');
-    assert.equal(docs[1].receiver, 'DragonHunter');
-    assert.equal(docs[1].ctx.type, K.TYPE_FUNCTION);
-    assert.equal(docs[1].ctx.scope, K.SCOPE_PROTOTYPE);
+    assert.equal(docs[1].receiver, 'API.DragonHunter');
+  });
+
+  context('when the target is a prototype...', function() {
+    var docs;
+
+    before(function() {
+      docs = TestUtils.parseInline(function() {;
+        // /** @module */
+        // var DragonHunter = {};
+        //
+        // /** @memberOf DragonHunter.prototype */
+        // function capture() {}
+      });
+
+      assert.equal(docs.length, 2);
+    });
+
+    it('omits ".prototype" from the receiver', function() {
+      assert.equal(docs[1].name, 'capture');
+      assert.equal(docs[1].receiver, 'DragonHunter');
+    });
+
+    it('adjusts the scope so that it is "SCOPE_PROTOTYPE"', function() {
+      assert.equal(docs[1].nodeInfo.scope, K.SCOPE_PROTOTYPE);
+    });
+  });
+
+  context('when the target is aliased...', function() {
+    var docs;
+
+    before(function() {
+      docs = TestUtils.parseInline(function() {;
+        // /**
+        //  * @module
+        //  * @alias Foo
+        //  */
+        // var DragonHunter = {};
+        //
+        // /** @memberOf Foo */
+        // function capture() {}
+      });
+
+      assert.equal(docs.length, 2);
+    });
+
+    it('uses the original target name as the receiver', function() {
+      assert.equal(docs[1].name, 'capture');
+      assert.equal(docs[1].receiver, 'DragonHunter');
+    });
+  });
+
+  context('when the target is CommonJS "exports"...', function() {
+    var docs;
+
+    before(function() {
+      docs = TestUtils.parseInline(function() {;
+        // /** @module */
+        // var DragonHunter = eexports;
+        //
+        // /** @memberOf DragonHunter */
+        // function capture() {}
+      });
+
+      assert.equal(docs.length, 2);
+    });
+
+    it('resolves the identifier assigned to "exports" as the receiver', function() {
+      assert.equal(docs[1].name, 'capture');
+      assert.equal(docs[1].receiver, 'DragonHunter');
+    });
   });
 
   it('works with something like Object.defineProperty and @property', function() {
@@ -58,8 +130,9 @@ describe('CJS::Parser - @memberOf support', function() {
     assert.equal(docs.length, 2);
     assert.equal(docs[1].name, 'node');
     assert.equal(docs[1].receiver, 'DragonHunter');
-    assert.equal(docs[1].ctx.type, K.TYPE_UNKNOWN);
-    assert.equal(docs[1].ctx.scope, K.SCOPE_PROTOTYPE);
+    assert.equal(docs[1].type, 'String');
+    assert.equal(docs[1].symbol, '@');
+    assert.equal(docs[1].nodeInfo.scope, K.SCOPE_PROTOTYPE);
   });
 
   context('when the specified receiver @lends to something else', function() {
@@ -76,14 +149,14 @@ describe('CJS::Parser - @memberOf support', function() {
       });
 
       assert.equal(docs.length, 2);
-      assert.equal(docs[1].ctx.type, K.TYPE_FUNCTION);
+      assert.equal(docs[1].type, K.TYPE_FUNCTION);
       assert.equal(docs[1].name, 'capture');
       assert.equal(docs[1].receiver, 'DragonHunter');
     });
   });
 
   context('when they are spread across multiple files', function() {
-    var file1, file2;
+    var docs, file1, file2;
 
     beforeEach(function() {
       file1 = MegaTestUtils.createFile(multiline(function() {;
@@ -100,17 +173,31 @@ describe('CJS::Parser - @memberOf support', function() {
         //
         // module.exports = fn;
       }), 'module/fn.js');
-    });
 
-    it('works', function() {
-      var docs = TestUtils.parseFiles([ file1.path, file2.path ], {});
+      docs = TestUtils.parseFiles([ file1.path, file2.path ], {});
 
       assert.equal(docs.length, 2);
+    });
+
+    it('works', function() {
       var fnDoc = docs.filter(function(x) { return x.name === 'fn' })[0];
 
-      assert.equal(fnDoc.ctx.type, K.TYPE_FUNCTION);
+      assert.equal(fnDoc.type, K.TYPE_FUNCTION);
       assert.equal(fnDoc.name, 'fn');
       assert.equal(fnDoc.receiver, 'DOMSelectors');
     });
   });
+
+  it('should not consume description', function() {
+    var docs = TestUtils.parseInline(function() {;
+      // /**
+      //  * @memberOf Core.Data Some description.
+      //  */
+      // function add() {}
+    });
+
+    assert.equal(docs.length, 1);
+    assert.equal(docs[0].name, 'add');
+    assert.equal(docs[0].description, 'Some description.');
+  });
 });
diff --git a/packages/megadoc-plugin-js/lib/Parser/__tests__/features/@method.test.js b/packages/megadoc-plugin-js/lib/Parser/__tests__/features/@method.test.js
index 57582947..e244c293 100644
--- a/packages/megadoc-plugin-js/lib/Parser/__tests__/features/@method.test.js
+++ b/packages/megadoc-plugin-js/lib/Parser/__tests__/features/@method.test.js
@@ -26,7 +26,7 @@ describe('CJS::Parser - @method tag', function() {
     assert.ok(doc);
     assert.equal(doc.id, 'Compiler#on');
     assert.equal(doc.receiver, 'Compiler');
-    assert.equal(doc.ctx.type, K.TYPE_FUNCTION);
+    assert.equal(doc.type, K.TYPE_FUNCTION);
   });
 
   it('it accepts multiple dynamically generated methods in the same docstring', function() {
diff --git a/packages/megadoc-plugin-js/lib/Parser/__tests__/features/@mixes.test.js b/packages/megadoc-plugin-js/lib/Parser/__tests__/features/@mixes.test.js
index 4fef44a6..fe58dd6e 100644
--- a/packages/megadoc-plugin-js/lib/Parser/__tests__/features/@mixes.test.js
+++ b/packages/megadoc-plugin-js/lib/Parser/__tests__/features/@mixes.test.js
@@ -18,7 +18,7 @@ describe('CJS::Parser - @mixes support', function() {
     });
 
     assert.equal(docs.length, 2);
-    assert.equal(docs[1].ctx.type, K.TYPE_FUNCTION);
+    assert.equal(docs[1].type, K.TYPE_FUNCTION);
     assert.equal(docs[1].name, 'Document');
     assert.equal(docs[1].receiver, undefined);
     assert.equal(docs[1].description, 'Hello baby.', 'It grabs the rest of the docstring from @mixes');
diff --git a/packages/megadoc-plugin-js/lib/Parser/__tests__/features/@module.test.js b/packages/megadoc-plugin-js/lib/Parser/__tests__/features/@module.test.js
index 9c04c3c3..3ccd4323 100644
--- a/packages/megadoc-plugin-js/lib/Parser/__tests__/features/@module.test.js
+++ b/packages/megadoc-plugin-js/lib/Parser/__tests__/features/@module.test.js
@@ -1,5 +1,6 @@
 var assert = require('assert');
 var TestUtils = require('../../TestUtils');
+var K = require('../../constants');
 var parseInline = TestUtils.parseInline;
 
 describe('CJS::Parser - @module support', function() {
@@ -28,9 +29,7 @@ describe('CJS::Parser - @module support', function() {
     assert.equal(docs[0].name, 'Something');
   });
 
-  // DISABLED until we figure it out with babel transformer...
-  // identifiers of destructured variable declarations seem to be lost o.O
-  it.skip('should work with imported modules using ES6 destructuring', function() {
+  it('should work with imported modules using ES6 destructuring', function() {
     var docs = parseInline(function() {;
       // /**
       //  * @namespace Core
@@ -48,11 +47,31 @@ describe('CJS::Parser - @module support', function() {
     assert.equal(docs.length, 2);
     assert.equal(docs[0].name, 'Something');
     assert.equal(docs[0].namespace, 'Core');
-    assert.equal(docs[0].ctx.type, 'object');
+    assert.equal(docs[0].type, K.TYPE_UNKNOWN);
 
     assert.equal(docs[1].name, 'someFunc');
     assert.equal(docs[1].receiver, 'Core.Something');
-    assert.equal(docs[1].ctx.type, 'function');
+    assert.equal(docs[1].type, K.TYPE_FUNCTION);
+  });
+
+  it('should not cause a duplication when comment node is in the Program scope', function() {
+    var docs = parseInline(function() {;
+      // const chai = require("chai");
+      //
+      // /**
+      //  * @module TestHelpers.chaiAssertions
+      //  */
+      // var { Assertion } = chai;
+    }, {
+      parserOptions: {
+        presets: [
+          'es2015',
+          'react',
+        ]
+      }
+    });
+
+    assert.equal(docs.length, 1);
   });
 
   describe('@module with an inline namespace', function() {
diff --git a/packages/megadoc-plugin-js/lib/Parser/__tests__/features/@namespace.test.js b/packages/megadoc-plugin-js/lib/Parser/__tests__/features/@namespace.test.js
index c707de6b..e5108832 100644
--- a/packages/megadoc-plugin-js/lib/Parser/__tests__/features/@namespace.test.js
+++ b/packages/megadoc-plugin-js/lib/Parser/__tests__/features/@namespace.test.js
@@ -43,4 +43,20 @@ describe('CJS::Parser - @namespace support', function() {
     assert.equal(docs[0].namespace, 'Core.Data');
     assert.equal(docs[0].id, 'Core.Data.Cache');
   });
+
+  it('should not consume description', function() {
+    var docs = parseInline(function() {;
+      // /**
+      //  * @namespace Core.Data
+      //  *
+      //  * Some description.
+      //  */
+      // var Cache = {};
+    });
+
+    assert.equal(docs.length, 1);
+    assert.equal(docs[0].name, 'Cache');
+    assert.equal(docs[0].namespace, 'Core.Data');
+    assert.equal(docs[0].description, 'Some description.');
+  });
 });
\ No newline at end of file
diff --git a/packages/megadoc-plugin-js/lib/Parser/__tests__/features/@type.test.js b/packages/megadoc-plugin-js/lib/Parser/__tests__/features/@type.test.js
index 5e90c718..70de0e22 100644
--- a/packages/megadoc-plugin-js/lib/Parser/__tests__/features/@type.test.js
+++ b/packages/megadoc-plugin-js/lib/Parser/__tests__/features/@type.test.js
@@ -1,6 +1,6 @@
 var TestUtils = require('../../TestUtils');
 var K = require('../../constants');
-var assert = require('assert');
+var assert = require('chai').assert;
 
 describe('CJS::Parser - @type support', function() {
   it('respects the @type specified even if no context was generated', function() {
@@ -13,6 +13,6 @@ describe('CJS::Parser - @type support', function() {
     });
 
     assert.equal(docs.length, 1);
-    assert.equal(docs[0].ctx.type, K.TYPE_FUNCTION);
+    assert.equal(docs[0].type, K.TYPE_FUNCTION);
   });
 });
\ No newline at end of file
diff --git a/packages/megadoc-plugin-js/lib/Parser/__tests__/features/CommonJS.test.js b/packages/megadoc-plugin-js/lib/Parser/__tests__/features/CommonJS.test.js
index f57b3bc2..4e31d023 100644
--- a/packages/megadoc-plugin-js/lib/Parser/__tests__/features/CommonJS.test.js
+++ b/packages/megadoc-plugin-js/lib/Parser/__tests__/features/CommonJS.test.js
@@ -1,6 +1,7 @@
-var assert = require('assert');
+var assert = require('chai').assert;
 var TestUtils = require('../../TestUtils');
 var parseInline = TestUtils.parseInline;
+var MegaTestUtils = require('megadoc/lib/TestUtils');
 
 describe('CJS::Parser - CommonJS automatic module identification', function() {
   it('var SomeModule = function() {}; module.exports = SomeModule;', function() {
@@ -140,4 +141,80 @@ describe('CJS::Parser - CommonJS automatic module identification', function() {
     assert.ok(docs[0].isModule, 'it marks the doc as module');
     assert.equal(docs[0].id, 'OverriddenName');
   });
+
+  // man this was a crazy bug xD
+  context('when an identifier exists in two files, and is exported in one of them...', function() {
+    var docs, file1, file2;
+    var suite = MegaTestUtils.IntegrationSuite(this);
+
+    beforeEach(function() {
+      file1 = suite.createFile('a.js', function() {;
+        // /** A module */
+        // function Corpus() {
+        //   var exports = {};
+        //
+        //   /** Teehee! */
+        //   exports.resolve = function() {}
+        //
+        //   return exports;
+        // }
+        //
+        // module.exports = Corpus;
+      });
+
+      file2 = suite.createFile('b.js', function() {;
+        // function resolve() {}
+        //
+        // module.exports = resolve;
+      });
+
+      docs = TestUtils.parseFiles([ file1.path, file2.path ], {});
+
+      assert.equal(docs.length, 2);
+    });
+
+    it('does not confuse them', function() {
+      assert.include(docs[0], { id: 'Corpus', isModule: true });
+      assert.include(docs[1], { id: 'Corpus#resolve', isModule: false });
+    });
+  });
+
+  // shoot me
+  context('when an identifier exists in two files, is a module in one but not the other, and is exported in one of them...', function() {
+    var docs, file1, file2;
+    var suite = MegaTestUtils.IntegrationSuite(this);
+
+    beforeEach(function() {
+      file1 = suite.createFile('a.js', function() {;
+        // /** A module */
+        // function Corpus() {
+        //   var exports = {};
+        //
+        //   /** Teehee! */
+        //   exports.resolve = function() {}
+        //
+        //   return exports;
+        // }
+        //
+        // module.exports = Corpus;
+      });
+
+      file2 = suite.createFile('b.js', function() {;
+        // /** Foo */
+        // function resolve() {}
+        //
+        // module.exports = resolve;
+      });
+
+      docs = TestUtils.parseFiles([ file1.path, file2.path ], {});
+
+      assert.equal(docs.length, 3);
+    });
+
+    it('does not confuse them', function() {
+      assert.include(docs[0], { id: 'Corpus', isModule: true });
+      assert.include(docs[1], { id: 'Corpus#resolve', isModule: false });
+      assert.include(docs[2], { id: 'resolve', isModule: true });
+    });
+  });
 });
\ No newline at end of file
diff --git a/packages/megadoc-plugin-js/lib/Parser/__tests__/features/ES6__defaultValues.test.js b/packages/megadoc-plugin-js/lib/Parser/__tests__/features/ES6__defaultValues.test.js
index b6373442..5d99db03 100644
--- a/packages/megadoc-plugin-js/lib/Parser/__tests__/features/ES6__defaultValues.test.js
+++ b/packages/megadoc-plugin-js/lib/Parser/__tests__/features/ES6__defaultValues.test.js
@@ -12,7 +12,7 @@ describe('CJS::Parser - ES6 - defaultValues', function() {
     });
 
     assert.equal(docs.length, 1);
-    assert.equal(docs[0].ctx.type, K.TYPE_FUNCTION);
+    assert.equal(docs[0].type, K.TYPE_FUNCTION);
   });
 
   it('works with default values assigned to destructured object `function x({ param = 5 }) {}`', function() {
@@ -23,6 +23,6 @@ describe('CJS::Parser - ES6 - defaultValues', function() {
     });
 
     assert.equal(docs.length, 1);
-    assert.equal(docs[0].ctx.type, K.TYPE_FUNCTION);
+    assert.equal(docs[0].type, K.TYPE_FUNCTION);
   });
 });
diff --git a/packages/megadoc-plugin-js/lib/Parser/__tests__/features/FactoryModules.test.js b/packages/megadoc-plugin-js/lib/Parser/__tests__/features/FactoryModules.test.js
index 3dd43d39..2df863e0 100644
--- a/packages/megadoc-plugin-js/lib/Parser/__tests__/features/FactoryModules.test.js
+++ b/packages/megadoc-plugin-js/lib/Parser/__tests__/features/FactoryModules.test.js
@@ -29,9 +29,9 @@ describe('CJS::Parser - Factory modules', function() {
     doc = findWhere(docs, { id: 'DragonHunter#someMethod' });
 
     assert.ok(doc);
-    assert.equal(doc.ctx.type, K.TYPE_FUNCTION);
+    assert.equal(doc.type, K.TYPE_FUNCTION);
     assert.equal(doc.receiver, 'DragonHunter');
-    assert.equal(doc.ctx.scope, K.SCOPE_FACTORY_EXPORTS);
+    assert.equal(doc.nodeInfo.scope, K.SCOPE_FACTORY_EXPORTS);
   });
 
   it('parses properties in a literal return object', function() {
@@ -53,9 +53,9 @@ describe('CJS::Parser - Factory modules', function() {
     doc = findWhere(docs, { id: 'DragonHunter@someProp' });
 
     assert.ok(doc);
-    assert.equal(doc.ctx.type, K.TYPE_LITERAL);
+    assert.equal(doc.type, K.TYPE_LITERAL);
     assert.equal(doc.receiver, 'DragonHunter');
-    assert.equal(doc.ctx.scope, K.SCOPE_FACTORY_EXPORTS);
+    assert.equal(doc.nodeInfo.scope, K.SCOPE_FACTORY_EXPORTS);
   });
 
   it('parses entities in a locally-scoped returned object', function() {
@@ -83,16 +83,16 @@ describe('CJS::Parser - Factory modules', function() {
     doc = findWhere(docs, { id: 'DragonHunter#someMethod' });
 
     assert.ok(doc);
-    assert.equal(doc.ctx.type, K.TYPE_FUNCTION);
+    assert.equal(doc.type, K.TYPE_FUNCTION);
     assert.equal(doc.receiver, 'DragonHunter');
-    assert.equal(doc.ctx.scope, K.SCOPE_FACTORY_EXPORTS);
+    assert.equal(doc.nodeInfo.scope, K.SCOPE_FACTORY_EXPORTS);
 
     doc = findWhere(docs, { id: 'DragonHunter@someProp' });
 
     assert.ok(doc);
-    assert.equal(doc.ctx.type, K.TYPE_LITERAL);
+    assert.equal(doc.type, K.TYPE_LITERAL);
     assert.equal(doc.receiver, 'DragonHunter');
-    assert.equal(doc.ctx.scope, K.SCOPE_FACTORY_EXPORTS);
+    assert.equal(doc.nodeInfo.scope, K.SCOPE_FACTORY_EXPORTS);
   });
 
   it('parse static methods & properties', function() {
@@ -120,27 +120,27 @@ describe('CJS::Parser - Factory modules', function() {
 
     doc = findWhere(docs, { id: 'DragonHunter#someMethod' });
     assert.ok(doc);
-    assert.equal(doc.ctx.type, K.TYPE_FUNCTION);
+    assert.equal(doc.type, K.TYPE_FUNCTION);
     assert.equal(doc.receiver, 'DragonHunter');
-    assert.equal(doc.ctx.scope, K.SCOPE_FACTORY_EXPORTS);
+    assert.equal(doc.nodeInfo.scope, K.SCOPE_FACTORY_EXPORTS);
 
     doc = findWhere(docs, { id: 'DragonHunter@someProp' });
     assert.ok(doc);
-    assert.equal(doc.ctx.type, K.TYPE_LITERAL);
+    assert.equal(doc.type, K.TYPE_LITERAL);
     assert.equal(doc.receiver, 'DragonHunter');
-    assert.equal(doc.ctx.scope, K.SCOPE_FACTORY_EXPORTS);
+    assert.equal(doc.nodeInfo.scope, K.SCOPE_FACTORY_EXPORTS);
 
     doc = findWhere(docs, { id: 'DragonHunter.someStaticMethod' });
     assert.ok(doc);
-    assert.equal(doc.ctx.type, K.TYPE_FUNCTION);
+    assert.equal(doc.type, K.TYPE_FUNCTION);
     assert.equal(doc.receiver, 'DragonHunter');
-    assert.equal(doc.ctx.scope, undefined);
+    assert.equal(doc.nodeInfo.scope, undefined);
 
     doc = findWhere(docs, { id: 'DragonHunter.SOME_STATIC_PROP' });
     assert.ok(doc);
-    assert.equal(doc.ctx.type, K.TYPE_LITERAL);
+    assert.equal(doc.type, K.TYPE_LITERAL);
     assert.equal(doc.receiver, 'DragonHunter');
-    assert.equal(doc.ctx.scope, undefined);
+    assert.equal(doc.nodeInfo.scope, undefined);
   });
 
   it('works with a named function returned in a return literal', function() {
@@ -162,9 +162,9 @@ describe('CJS::Parser - Factory modules', function() {
     doc = findWhere(docs, { id: 'DragonHunter#capture' });
 
     assert.ok(doc);
-    assert.equal(doc.ctx.type, K.TYPE_FUNCTION);
+    assert.equal(doc.type, K.TYPE_FUNCTION);
     assert.equal(doc.receiver, 'DragonHunter');
-    assert.equal(doc.ctx.scope, K.SCOPE_FACTORY_EXPORTS);
+    assert.equal(doc.nodeInfo.scope, K.SCOPE_FACTORY_EXPORTS);
   });
 
   it('works with an anonymous function returned in a return literal', function() {
@@ -184,9 +184,9 @@ describe('CJS::Parser - Factory modules', function() {
     doc = findWhere(docs, { id: 'DragonHunter#' + K.DEFAULT_FACTORY_EXPORTS_ID });
 
     assert.ok(doc);
-    assert.equal(doc.ctx.type, K.TYPE_FUNCTION);
+    assert.equal(doc.type, K.TYPE_FUNCTION);
     assert.equal(doc.receiver, 'DragonHunter');
-    assert.equal(doc.ctx.scope, K.SCOPE_FACTORY_EXPORTS);
+    assert.equal(doc.nodeInfo.scope, K.SCOPE_FACTORY_EXPORTS);
   });
 
   it('works with an anonymous factory assigned to module.exports', function() {
@@ -211,8 +211,8 @@ describe('CJS::Parser - Factory modules', function() {
 
     assert.equal(docs[1].id, 'FactoryModule#getAssetPath');
     assert.equal(docs[1].receiver, 'FactoryModule');
-    assert.equal(docs[1].ctx.type, K.TYPE_FUNCTION);
-    assert.equal(docs[1].ctx.scope, K.SCOPE_FACTORY_EXPORTS);
+    assert.equal(docs[1].type, K.TYPE_FUNCTION);
+    assert.equal(docs[1].nodeInfo.scope, K.SCOPE_FACTORY_EXPORTS);
   });
 
   it('works with a namespaced factory', function() {
@@ -238,13 +238,13 @@ describe('CJS::Parser - Factory modules', function() {
     assert.equal(docs.length, 3);
 
     doc = findWhere(docs, { id: 'Core.EventEmitter#emitChange' });
-    assert.equal(doc.ctx.scope, K.SCOPE_FACTORY_EXPORTS);
-    assert.equal(doc.ctx.type, K.TYPE_FUNCTION);
+    assert.equal(doc.nodeInfo.scope, K.SCOPE_FACTORY_EXPORTS);
+    assert.equal(doc.type, K.TYPE_FUNCTION);
     assert.equal(doc.receiver, 'Core.EventEmitter');
 
     doc = findWhere(docs, { id: 'Core.EventEmitter.throttleEmitter' });
-    assert.equal(doc.ctx.type, K.TYPE_FUNCTION);
-    assert.equal(doc.ctx.scope, K.SCOPE_UNSCOPED);
+    assert.equal(doc.type, K.TYPE_FUNCTION);
+    assert.equal(doc.nodeInfo.scope, K.SCOPE_UNSCOPED);
     assert.equal(doc.receiver, 'Core.EventEmitter');
   });
 });
\ No newline at end of file
diff --git a/packages/megadoc-plugin-js/lib/Parser/__tests__/features/FunctionModules.test.js b/packages/megadoc-plugin-js/lib/Parser/__tests__/features/FunctionModules.test.js
index ea38188f..a3f1386a 100644
--- a/packages/megadoc-plugin-js/lib/Parser/__tests__/features/FunctionModules.test.js
+++ b/packages/megadoc-plugin-js/lib/Parser/__tests__/features/FunctionModules.test.js
@@ -23,7 +23,7 @@ describe('CJS::Parser - Function modules', function() {
     doc = findWhere(docs, { id: 'DragonHunter.someFunction' });
 
     assert.ok(doc);
-    assert.equal(doc.ctx.type, K.TYPE_FUNCTION);
+    assert.equal(doc.type, K.TYPE_FUNCTION);
     assert.equal(doc.receiver, 'DragonHunter');
   });
 
@@ -45,7 +45,7 @@ describe('CJS::Parser - Function modules', function() {
     doc = findWhere(docs, { id: 'DragonHunter.SOME_PROP' });
 
     assert.ok(doc);
-    assert.equal(doc.ctx.type, K.TYPE_LITERAL);
+    assert.equal(doc.type, K.TYPE_LITERAL);
     assert.equal(doc.receiver, 'DragonHunter');
   });
 
@@ -67,7 +67,7 @@ describe('CJS::Parser - Function modules', function() {
     doc = findWhere(docs, { id: 'DragonHunter.SOME_PROP' });
 
     assert.ok(doc);
-    assert.equal(doc.ctx.type, K.TYPE_UNKNOWN);
+    assert.equal(doc.type, K.TYPE_UNKNOWN);
     assert.equal(doc.receiver, 'DragonHunter');
   });
 });
diff --git a/packages/megadoc-plugin-js/lib/Parser/__tests__/features/Literal.test.js b/packages/megadoc-plugin-js/lib/Parser/__tests__/features/Literal.test.js
new file mode 100644
index 00000000..d46af994
--- /dev/null
+++ b/packages/megadoc-plugin-js/lib/Parser/__tests__/features/Literal.test.js
@@ -0,0 +1,117 @@
+var assert = require('assert');
+var TestUtils = require('../../TestUtils');
+var K = require('../../constants');
+var parseInline = TestUtils.parseInline;
+
+describe('CJS::Parser - Literal nodes annotated with comments', function() {
+  it('works using @method', function() {
+    var docs = parseInline(function() {;
+      // /**
+      //  * @module sinonSuite
+      //  */
+      // function sinonSuite() {
+      //   var properties = [
+      //     /**
+      //      * @method spy
+      //      *
+      //      * @param {Object} target
+      //      * @param {String} methodName
+      //      *
+      //      * Install a spy on a target.
+      //      */
+      //     "spy",
+      //   ];
+      //
+      //   properties.forEach(function(prop) { this[prop] = proxy(prop); }.bind(this));
+      // }
+    });
+
+    assert.equal(docs.length, 2);
+    assert.equal(docs[0].type, K.TYPE_FUNCTION);
+
+    assert.equal(docs[1].name, 'spy');
+    assert.equal(docs[1].receiver, 'sinonSuite');
+    assert.equal(docs[1].type, K.TYPE_FUNCTION);
+  });
+
+  it('works as a @property', function() {
+    var docs = parseInline(function() {;
+      // /**
+      //  * @module sinonSuite
+      //  */
+      // function sinonSuite() {
+      //   var properties = [
+      //     /**
+      //      * @property {Function} spy
+      //      *
+      //      * @param {Object} target
+      //      * @param {String} methodName
+      //      *
+      //      * Install a spy on a target.
+      //      */
+      //     "spy",
+      //   ];
+      //
+      //   properties.forEach(function(prop) { this[prop] = proxy(prop); }.bind(this));
+      // }
+    });
+
+    assert.equal(docs.length, 2);
+    assert.equal(docs[0].type, K.TYPE_FUNCTION);
+
+    assert.equal(docs[1].name, 'spy');
+    assert.equal(docs[1].receiver, 'sinonSuite');
+    assert.equal(docs[1].nodeInfo.scope, K.SCOPE_FACTORY_EXPORTS);
+    assert.equal(docs[1].type, K.TYPE_FUNCTION);
+    assert.equal(docs[1].symbol, '#');
+  });
+
+  it('works as a @memberOf an object using @name to name it', function() {
+    var docs = parseInline(function() {;
+      // /** @module */
+      // var x = {};
+      //
+      // var properties = [
+      //   /**
+      //    * @memberOf x
+      //    * @name spy
+      //    */
+      //   "spy",
+      // ];
+    });
+
+    assert.equal(docs.length, 2);
+    assert.equal(docs[0].type, K.TYPE_OBJECT);
+
+    assert.equal(docs[1].name, 'spy');
+    assert.equal(docs[1].receiver, 'x');
+    assert.equal(docs[1].nodeInfo.scope, K.SCOPE_UNSCOPED);
+    assert.equal(docs[1].type, K.TYPE_UNKNOWN);
+    assert.equal(docs[1].symbol, '.');
+  });
+
+  it('works as a @memberOf an object using @name to name it and @type to specify it', function() {
+    var docs = parseInline(function() {;
+      // /** @module */
+      // var x = {};
+      //
+      // var properties = [
+      //   /**
+      //    * @memberOf x
+      //    * @name spy
+      //    * @type {Function}
+      //    */
+      //   "spy",
+      // ];
+    });
+
+    assert.equal(docs.length, 2);
+    assert.equal(docs[0].type, K.TYPE_OBJECT);
+
+    assert.equal(docs[1].name, 'spy');
+    assert.equal(docs[1].receiver, 'x');
+    assert.equal(docs[1].nodeInfo.scope, K.SCOPE_UNSCOPED);
+    assert.equal(docs[1].type, K.TYPE_FUNCTION);
+    assert.equal(docs[1].symbol, '.');
+  });
+});
diff --git a/packages/megadoc-plugin-js/lib/Parser/__tests__/features/ObjectModules.test.js b/packages/megadoc-plugin-js/lib/Parser/__tests__/features/ObjectModules.test.js
index 9c74607a..e07ce20c 100644
--- a/packages/megadoc-plugin-js/lib/Parser/__tests__/features/ObjectModules.test.js
+++ b/packages/megadoc-plugin-js/lib/Parser/__tests__/features/ObjectModules.test.js
@@ -1,6 +1,7 @@
 var assert = require('assert');
 var TestUtils = require('../../TestUtils');
 var path = require('path');
+var K = require('../../constants');
 var parseInline = TestUtils.parseInline;
 
 describe('CJS::Parser - Object modules', function() {
@@ -18,7 +19,7 @@ describe('CJS::Parser - Object modules', function() {
 
     assert.equal(docs.length, 2);
     assert.equal(docs[1].id, 'DragonHunter.capture');
-    assert.equal(docs[1].ctx.type, 'function');
+    assert.equal(docs[1].type, K.TYPE_FUNCTION);
     assert.equal(docs[1].receiver, 'DragonHunter');
   });
 
@@ -34,10 +35,10 @@ describe('CJS::Parser - Object modules', function() {
     });
 
     assert.equal(docs.length, 2);
-    assert.equal(docs[1].ctx.type, 'literal');
+    assert.equal(docs[1].type, K.TYPE_LITERAL);
     assert.equal(docs[1].name, 'someProperty');
     assert.equal(docs[1].receiver, 'DragonHunter');
-    assert.equal(docs[1].ctx.value, 'a');
+    assert.equal(docs[1].nodeInfo.value, 'a');
   });
 
   it('parses static properties with an ObjectExpression value', function() {
@@ -53,13 +54,13 @@ describe('CJS::Parser - Object modules', function() {
     });
 
     assert.equal(docs.length, 2);
-    assert.equal(docs[1].ctx.type, 'object');
+    assert.equal(docs[1].type, K.TYPE_OBJECT);
     assert.equal(docs[1].name, 'someProperty');
     assert.equal(docs[1].receiver, 'DragonHunter');
-    assert.deepEqual(docs[1].ctx.properties, []);
+    assert.deepEqual(docs[1].nodeInfo.properties, []);
   });
 
-  it('does not confuse tokens with ones defined in another file', function() {
+  it.skip('does not confuse tokens with ones defined in another file', function() {
     var docs = TestUtils.parseFiles([
       // oh WTF? come on
       path.resolve(__dirname, '../../../config.js'),
diff --git a/packages/megadoc-plugin-js/lib/Parser/__tests__/features/PrototypalModules.test.js b/packages/megadoc-plugin-js/lib/Parser/__tests__/features/PrototypalModules.test.js
index 6d342999..732fadf8 100644
--- a/packages/megadoc-plugin-js/lib/Parser/__tests__/features/PrototypalModules.test.js
+++ b/packages/megadoc-plugin-js/lib/Parser/__tests__/features/PrototypalModules.test.js
@@ -24,8 +24,10 @@ describe('CJS::Parser - Prototypal modules', function() {
 
     assert.ok(doc);
     assert.equal(doc.receiver, 'DragonHunter');
-    assert.equal(doc.ctx.type, 'literal');
-    assert.equal(doc.ctx.scope, K.SCOPE_INSTANCE);
+    assert.equal(doc.type, 'String');
+    assert.equal(doc.nodeInfo.type, 'Literal');
+    assert.equal(doc.nodeInfo.value, 'a');
+    assert.equal(doc.nodeInfo.scope, K.SCOPE_INSTANCE);
   });
 
   it('parses prototype methods', function() {
@@ -45,9 +47,9 @@ describe('CJS::Parser - Prototypal modules', function() {
     doc = findWhere(docs, { id: 'DragonHunter#someMethod' });
 
     assert.ok(doc);
-    assert.equal(doc.ctx.type, 'function');
+    assert.equal(doc.type, K.TYPE_FUNCTION);
     assert.equal(doc.receiver, 'DragonHunter');
-    assert.equal(doc.ctx.scope, K.SCOPE_PROTOTYPE);
+    assert.equal(doc.nodeInfo.scope, K.SCOPE_PROTOTYPE);
   });
 
   it('parses prototype properties', function() {
@@ -67,8 +69,8 @@ describe('CJS::Parser - Prototypal modules', function() {
     doc = findWhere(docs, { id: 'DragonHunter@someProperty' });
 
     assert.ok(doc);
-    assert.equal(doc.ctx.type, 'literal');
+    assert.equal(doc.type, K.TYPE_LITERAL);
     assert.equal(doc.receiver, 'DragonHunter');
-    assert.equal(doc.ctx.scope, K.SCOPE_PROTOTYPE);
+    assert.equal(doc.nodeInfo.scope, K.SCOPE_PROTOTYPE);
   });
 });
diff --git a/packages/megadoc-plugin-js/lib/Parser/__tests__/features/TypeIdentification.test.js b/packages/megadoc-plugin-js/lib/Parser/__tests__/features/TypeIdentification.test.js
index adae52b8..71b05e6b 100644
--- a/packages/megadoc-plugin-js/lib/Parser/__tests__/features/TypeIdentification.test.js
+++ b/packages/megadoc-plugin-js/lib/Parser/__tests__/features/TypeIdentification.test.js
@@ -11,7 +11,7 @@ describe('CJS::Parser - Type Identification', function() {
     });
 
     assert.equal(docs.length, 1);
-    assert.equal(docs[0].ctx.type, K.TYPE_OBJECT);
+    assert.equal(docs[0].type, K.TYPE_OBJECT);
   });
 
   it('marks `var SomeModule = function {};` as a `function`', function() {
@@ -21,7 +21,7 @@ describe('CJS::Parser - Type Identification', function() {
     });
 
     assert.equal(docs.length, 1);
-    assert.equal(docs[0].ctx.type, K.TYPE_FUNCTION);
+    assert.equal(docs[0].type, K.TYPE_FUNCTION);
   });
 
   it('marks `function SomeModule() {}` as a `function`', function() {
@@ -31,14 +31,10 @@ describe('CJS::Parser - Type Identification', function() {
     });
 
     assert.equal(docs.length, 1);
-    assert.equal(docs[0].ctx.type, K.TYPE_FUNCTION);
+    assert.equal(docs[0].type, K.TYPE_FUNCTION);
   });
 
-  // DISABLED until we figure it out with babel's transformer
-  //
-  // classes seem to be implicitly transpiled to functions in the AST with no
-  // magic markers what so ever?
-  it.skip('marks `class SomeModule {}` as a `class`', function() {
+  it('marks `class SomeModule {}` as a `class`', function() {
     var docs = parseInline(function() {;
       // /** @module */
       // class DragonHunter {
@@ -46,6 +42,6 @@ describe('CJS::Parser - Type Identification', function() {
     });
 
     assert.equal(docs.length, 1);
-    assert.equal(docs[0].ctx.type, K.TYPE_CLASS);
+    assert.equal(docs[0].type, K.TYPE_CLASS);
   });
 });
diff --git a/packages/megadoc-plugin-js/lib/Parser/__tests__/features/customAnalyzer.test.js b/packages/megadoc-plugin-js/lib/Parser/__tests__/features/customAnalyzer.test.js
index 893307ac..6cc80853 100644
--- a/packages/megadoc-plugin-js/lib/Parser/__tests__/features/customAnalyzer.test.js
+++ b/packages/megadoc-plugin-js/lib/Parser/__tests__/features/customAnalyzer.test.js
@@ -41,6 +41,6 @@ describe('CJS::Parser: customAnalyzer support', function() {
     assert.equal(docs.length, 1);
     assert.equal(docs[0].id, 'SomeComponent');
     assert.equal(docs[0].isModule, true);
-    assert.equal(docs[0].ctx.type, 'component');
+    assert.equal(docs[0].type, 'component');
   });
 });
\ No newline at end of file
diff --git a/packages/megadoc-plugin-js/lib/Parser/__tests__/features/name.test.js b/packages/megadoc-plugin-js/lib/Parser/__tests__/features/name.test.js
new file mode 100644
index 00000000..4490b437
--- /dev/null
+++ b/packages/megadoc-plugin-js/lib/Parser/__tests__/features/name.test.js
@@ -0,0 +1,32 @@
+var assert = require('assert');
+var TestUtils = require('../../TestUtils');
+var parseInline = TestUtils.parseInline;
+
+describe('CJS::Parser - @name support', function() {
+  it('should override a module id', function() {
+    var docs = parseInline(function() {;
+      // /**
+      //  * @name Foo
+      //  * @module
+      //  */
+      // var Cache = {};
+    });
+
+    assert.equal(docs.length, 1);
+    assert.equal(docs[0].name, 'Foo');
+  });
+
+  it('should not infer a namespace from it', function() {
+    var docs = parseInline(function() {;
+      // /**
+      //  * @name Foo.Bar
+      //  * @module
+      //  */
+      // var Cache = {};
+    });
+
+    assert.equal(docs.length, 1);
+    assert.equal(docs[0].name, 'Foo.Bar');
+    assert.equal(docs[0].namespace, undefined);
+  });
+});
\ No newline at end of file
diff --git a/packages/megadoc-plugin-js/lib/Parser/__tests__/index.test.js b/packages/megadoc-plugin-js/lib/Parser/__tests__/index.test.js
index 709ad6df..fe5a2462 100644
--- a/packages/megadoc-plugin-js/lib/Parser/__tests__/index.test.js
+++ b/packages/megadoc-plugin-js/lib/Parser/__tests__/index.test.js
@@ -1,11 +1,14 @@
-var assert = require('assert');
+var assert = require('chai').assert;
 var findWhere = require('lodash').findWhere;
 var TestUtils = require('../TestUtils');
 var K = require('../constants');
+var sinonSuite = require('megadoc/lib/TestUtils').sinonSuite;
 
 var parseInline = TestUtils.parseInline;
 
-describe('CJS::Parser', function() {
+describe('CJS::Parser::Main', function() {
+  var sinon = sinonSuite(this);
+
   it('should ignore @internal docs', function() {
     var docs = parseInline(function() {;
       // /**
@@ -21,6 +24,23 @@ describe('CJS::Parser', function() {
     assert.equal(docs.length, 0);
   });
 
+  it('should warn about invalid docstrings', function() {
+    sinon.stub(console, 'warn');
+
+    assert.throws(function() {
+      parseInline(function() {;
+        // /**
+        //  * @internal
+        //    Something.
+        //  */
+        //  function Something() {
+        //  }
+        //
+        //  module.exports = Something;
+      });
+    }, /Invalid annotation in comment block/);
+  });
+
   describe('resolving identifiers', function() {
     it('resolves an Identifier to a function', function() {
       var docs = parseInline(function() {;
@@ -40,9 +60,9 @@ describe('CJS::Parser', function() {
 
       var doc = findWhere(docs, { name: 'scan' });
 
-      assert.equal(doc.ctx.type, K.TYPE_FUNCTION);
+      assert.equal(doc.type, K.TYPE_FUNCTION);
       assert.equal(doc.receiver, 'DragonHunter');
-      assert.equal(doc.ctx.scope, K.SCOPE_FACTORY_EXPORTS);
+      assert.equal(doc.nodeInfo.scope, K.SCOPE_FACTORY_EXPORTS);
       assert.equal(doc.description, "Hi");
     });
 
@@ -63,9 +83,9 @@ describe('CJS::Parser', function() {
 
       var doc = findWhere(docs, { name: 'scan' });
 
-      assert.equal(doc.ctx.type, K.TYPE_LITERAL);
+      assert.equal(doc.type, K.TYPE_LITERAL);
       assert.equal(doc.receiver, 'DragonHunter');
-      assert.equal(doc.ctx.scope, K.SCOPE_FACTORY_EXPORTS);
+      assert.equal(doc.nodeInfo.scope, K.SCOPE_FACTORY_EXPORTS);
       assert.equal(doc.description, "Hi");
     });
   });
@@ -78,37 +98,91 @@ describe('CJS::Parser', function() {
 
       assert.equal(docs.length, 1);
       assert.equal(docs[0].id, 'Something');
-      assert.equal(docs[0].ctx.type, K.TYPE_UNKNOWN);
+      assert.equal(docs[0].type, K.TYPE_UNKNOWN);
       assert.equal(docs[0].isModule, true);
     });
 
-    it.skip('correctly maps entities to a node-free @module docstring', function() {
+    it('correctly maps entities to a node-free @module docstring', function() {
       var docs = parseInline(function() {;
-        // /** @module Something */
+        // /**
+        //   * @module Something
+        //   * @type {Object}
+        //   */
         //
         // /** weehee */
         // exports.someFunc = function() {
         // };
         //
         // /** weehee */
-        // exports.someOtherFunc = function() {
-        // };
+        // exports.someProperty = '5';
       });
 
       assert.equal(docs.length, 3);
 
       assert.equal(docs[0].id, 'Something');
-      assert.equal(docs[0].ctx.type, K.TYPE_UNKNOWN);
+      assert.deepEqual(docs[0].type, K.TYPE_OBJECT);
       assert.equal(docs[0].isModule, true);
 
-      assert.equal(docs[1].id, 'someFunc');
+      assert.equal(docs[1].name, 'someFunc');
       assert.equal(docs[1].receiver, 'Something');
-      assert.equal(docs[1].ctx.type, K.TYPE_FUNCTION);
-      assert.equal(docs[1].ctx.scope, K.SCOPE_UNSCOPED);
+      assert.equal(docs[1].type, K.TYPE_FUNCTION);
+      assert.equal(docs[1].nodeInfo.scope, K.SCOPE_UNSCOPED);
 
-      assert.equal(docs[2].id, 'someOtherFunc');
-      assert.equal(docs[2].ctx.type, K.TYPE_FUNCTION);
+      assert.equal(docs[2].name, 'someProperty');
       assert.equal(docs[2].receiver, 'Something');
+      assert.equal(docs[2].type, K.TYPE_LITERAL);
+    });
+  });
+
+  describe('config.alias', function() {
+    it('should use the aliases', function() {
+      var docs = parseInline(function() {;
+        // /**
+        //  * @module
+        //  */
+        //  function Foo() {
+        //  }
+      }, { alias: { 'Foo': [ 'Bar', 'Baz' ] } });
+
+      assert.equal(docs.length, 1);
+      assert.deepEqual(docs[0].aliases, [ 'Bar', 'Baz' ]);
+    });
+  });
+
+  describe('config.namespaceDirMap', function() {
+    it('should namespace modules that match the directory pattern', function() {
+      var docs = parseInline(function() {;
+        // /**
+        //  * @module
+        //  */
+        //  function Foo() {
+        //  }
+      }, {
+        namespaceDirMap: {
+          'lib/core': 'Core'
+        }
+      }, 'lib/core/Cache.js');
+
+      assert.equal(docs.length, 1);
+      assert.equal(docs[0].namespace, 'Core');
+    });
+
+    it('should ignore it if the module already has a namespace', function() {
+      var docs = parseInline(function() {;
+        // /**
+        //  * @module
+        //  * @namespace TheVoid
+        //  */
+        //  function Foo() {
+        //  }
+      }, {
+        namespaceDirMap: {
+          'lib/core': 'Core'
+        }
+      }, 'lib/core/Cache.js');
+
+      assert.equal(docs.length, 1);
+      assert.equal(docs[0].namespace, 'TheVoid');
     });
   });
 });
\ No newline at end of file
diff --git a/packages/megadoc-plugin-js/lib/Parser/constants.js b/packages/megadoc-plugin-js/lib/Parser/constants.js
index 0ecb73ef..7c8d8ecb 100644
--- a/packages/megadoc-plugin-js/lib/Parser/constants.js
+++ b/packages/megadoc-plugin-js/lib/Parser/constants.js
@@ -5,16 +5,47 @@ exports.SCOPE_INSTANCE = 'instance';
 exports.SCOPE_PROTOTYPE = 'prototype';
 exports.SCOPE_FACTORY_EXPORTS = 'factory_exports';
 
-exports.TYPE_OBJECT = 'object';
+exports.TYPE_OBJECT = 'Object';
+exports.TYPE_OBJECT_PROPERTY = 'ObjectProperty';
 exports.TYPE_DEFAULT_EXPORTS = 'exports';
-exports.TYPE_FACTORY = 'factory';
-exports.TYPE_FUNCTION = 'function';
-exports.TYPE_CLASS = 'class';
-exports.TYPE_ARRAY = 'array';
-exports.TYPE_LITERAL = 'literal';
-exports.TYPE_UNKNOWN = 'unknown';
+exports.TYPE_FACTORY = 'Factory';
+exports.TYPE_FUNCTION = 'Function';
+exports.TYPE_CLASS = 'Class';
+exports.TYPE_ARRAY = 'Array';
+exports.TYPE_UNKNOWN = 'Unknown';
+exports.TYPE_LITERAL = 'Literal';
+exports.TYPE_ALL_LITERAL = 'AllLiteral';
+exports.TYPE_UNKNOWN_LITERAL = 'UnknownLiteral';
+exports.TYPE_UNION = 'Union';
 
 exports.VISIBILITY_PROTECTED = 'protected';
 exports.VISIBILITY_PRIVATE = 'private';
 
-exports.DEFAULT_FACTORY_EXPORTS_ID = 'default_exports';
\ No newline at end of file
+exports.DEFAULT_FACTORY_EXPORTS_ID = 'default_exports';
+exports.TYPE_OVERRIDING_TAGS = {
+  'method': true,
+  'property': true,
+  'type': true,
+};
+
+exports.TAGS_WITH_STRINGS = {
+  'deprecated': true,
+  'example': true,
+};
+
+exports.NO_DESCRIPTION_TAGS = {
+  'alias': true,
+  'class': true,
+  'constructor': true,
+  'extends': true,
+  'inheritdoc': true,
+  'memberOf': true,
+  'method': true,
+  'mixin': true,
+  'mixes': true,
+  'module': true,
+  'namespace': true,
+  'preserveOrder': true,
+  'private': true,
+  'type': true,
+};
\ No newline at end of file
diff --git a/packages/megadoc-plugin-js/lib/Parser/index.js b/packages/megadoc-plugin-js/lib/Parser/index.js
index 3215746c..1e799f3e 100644
--- a/packages/megadoc-plugin-js/lib/Parser/index.js
+++ b/packages/megadoc-plugin-js/lib/Parser/index.js
@@ -1,12 +1,10 @@
 var fs = require('fs');
-var assert = require('assert');
-var Utils = require('./Utils');
+var nodejsPath = require('path');
+var ASTUtils = require('./ASTUtils');
 var Doc = require('./Doc');
 var Docstring = require('./Docstring');
 var Registry = require('./Registry');
-var PostProcessor = require('./PostProcessor');
 var NodeAnalyzer = require('./NodeAnalyzer');
-var WeakSet = require('weakset');
 var pick = require('lodash').pick;
 var assign = require('lodash').assign;
 var debuglog = require('megadoc/lib/Logger')('megadoc').info;
@@ -17,55 +15,64 @@ var runAllSync = require('../utils/runAllSync');
 
 function Parser() {
   this.registry = new Registry();
-
-  // @type {WeakSet<n.CommentNode>}
-  //
-  // This is necessary to track the comment nodes we visited because we might
-  // "force" a traversal of comments in the case of expression statements (so
-  // that the comments are parsed before actual module definitions)
-  //
-  // If we don't do this, we need to make multiple passes over the AST so meh.
-  this.visitedComments = new WeakSet();
 }
 
 var Ppt = Parser.prototype;
 
-Ppt.parseFile = function(filePath, config, commonPrefix) {
+Ppt.parseFile = function(filePath, config, assetRoot) {
+  var relativeFilePath = filePath.indexOf(assetRoot) === 0 ?
+    filePath.substr(assetRoot.length) :
+    filePath
+  ;
+
   try {
     this.parseString(
       fs.readFileSync(filePath, 'utf-8'),
       config,
-      filePath.replace(commonPrefix, ''),
+      relativeFilePath,
       filePath
     );
   }
   catch(e) {
-    console.error('Failed to parse ' + filePath);
+    console.error('Failed to parse ' + relativeFilePath);
     throw e;
   }
 };
 
 Ppt.parseString = function(str, config, filePath, absoluteFilePath) {
   if (str.length > 0) {
-    if (config.parse) {
-      this.ast = config.parse(str, filePath, absoluteFilePath);
-    }
-    else {
-      this.ast = babel.transform(str, assign({
-        filenameRelative: filePath,
-        filename: absoluteFilePath,
-        code: false,
-        ast: true,
-        babelrc: true,
-        comments: true
-      }, config.parserOptions)).ast;
+    try {
+      if (config.parse) {
+        this.ast = config.parse(str, absoluteFilePath);
+      }
+      else {
+        this.ast = babel.transform(str, assign({
+          filenameRelative: filePath,
+          filename: absoluteFilePath,
+          code: false,
+          ast: true,
+          babelrc: true,
+          comments: true,
+        }, config.parserOptions)).ast;
+      }
+
+      this.walk(this.ast, config, filePath);
     }
+    catch (e) {
+      if (config.strict) {
+        throw e;
+      }
+      else {
+        console.warn("File could not be parsed, most likely due to a SyntaxError. (Source: '%s')", filePath);
+        console.warn(e);
 
-    this.walk(this.ast, config, filePath, absoluteFilePath);
+        return;
+      }
+    }
   }
 };
 
-Ppt.walk = function(ast, inConfig, filePath, absoluteFilePath) {
+Ppt.walk = function(ast, inConfig, filePath) {
   var parser = this;
   var config = pick(inConfig, [
     'inferModuleIdFromFileName',
@@ -78,19 +85,6 @@ Ppt.walk = function(ast, inConfig, filePath, absoluteFilePath) {
     'namedReturnTags',
   ]);
 
-  Object.keys(config.alias).forEach(function(key) {
-    assert(Array.isArray(config.alias[key]),
-      "megadoc-plugin-js: OptionError: expected alias '" + key + "' entry to " +
-      " be an array, got '" + typeof config.alias[key] + "'."
-    );
-    config.alias[key].forEach(function(value) {
-      assert(typeof value === 'string',
-        "megadoc-plugin-js: OptionError: expected alias entry to be a string " +
-        ", not '" + typeof value + "' (key '" + key + "')"
-      );
-    });
-  });
-
   config.tagProcessors = config.tagProcessors || [];
   config.namespaceDirMap = config.namespaceDirMap || {};
 
@@ -101,29 +95,39 @@ Ppt.walk = function(ast, inConfig, filePath, absoluteFilePath) {
     enter: function(path) {
       var commentPool;
 
+      // Comments at the Program scope:
       if (t.isProgram(path.node) && path.node.innerComments && path.node.innerComments.length) {
         commentPool = path.node.innerComments;
       }
-
       else if (path.node.leadingComments && path.node.leadingComments.length) {
         commentPool = path.node.leadingComments;
       }
 
       if (commentPool) {
-        if (parser.visitedComments.has(path)) {
-          // console.log('Comment walker: already seen this node, ignoring.');
-          return false;
+        // Handle an edge-case with babel against ES6 destructured identifiers;
+        // it seems to attach the leading comments to both the VariableDeclaration
+        // node as well as the first identifier inside of it, so for the following
+        // snippet:
+        //
+        //     /**
+        //      * @module
+        //      */
+        //      var { Assertion } = require('chai');
+        //
+        // leadingComments will be set both on VariableDeclaration as well as
+        // Identifier(Assertion).
+        //
+        // We'll handle the VariableDeclaration and forget about the
+        // destructured variable identifier altogether.
+        if (ASTUtils.isCommentedDestructuredProperty(path)) {
+          return;
         }
 
-        parser.visitedComments.add(path);
-
         commentPool.forEach(function(commentNode) {
           var comment = commentNode.value;
 
           if (comment[0] === '*') {
-            if (!parser.parseComment(comment, path, path.node, config, filePath, absoluteFilePath)) {
-              return false;
-            }
+            parser.parseComment(comment, path, path.node, config, filePath);
           }
         });
       }
@@ -131,63 +135,58 @@ Ppt.walk = function(ast, inConfig, filePath, absoluteFilePath) {
 
     ExpressionStatement: function(path) {
       var node = path.node;
-      var doc, name;
+      var doc, name, expr;
 
-      if (node.comments) {
-        this.visit(path.get('comments'));
-      }
+      // module.exports = Something;
+      if (t.isAssignmentExpression(node.expression) && ASTUtils.isModuleExports(node.expression)) {
+        expr = node.expression;
+        name = ASTUtils.getVariableNameFromModuleExports(expr);
 
-      if (t.isAssignmentExpression(node.expression)) {
-        var expr = node.expression;
-
-        // module.exports = Something;
-        if (Utils.isModuleExports(expr)) {
-          name = Utils.getVariableNameFromModuleExports(expr);
-
-          if (!name && config.inferModuleIdFromFileName) {
-            name = Utils.getVariableNameFromFilePath(filePath);
-          }
+        if (!name && config.inferModuleIdFromFileName) {
+          name = ASTUtils.getVariableNameFromFilePath(filePath);
+        }
 
-          if (name) {
-            doc = parser.registry.get(name, filePath);
+        if (name) {
+          doc = parser.registry.get(name, filePath);
 
-            if (doc) {
-              var modulePath = Utils.findNearestPathWithComments(doc.$path);
+          if (doc) {
+            var modulePath = ASTUtils.findNearestPathWithComments(doc.$path);
 
-              doc.markAsExported();
-              parser.registry.trackModuleDocAtPath(doc, modulePath);
-            }
-          }
-          else {
-            console.warn(
-              'Unable to identify exported module id. ' +
-              'This probably means you are using an unnamed `module.exports`.' +
-              ' (source: %s)',
-              Utils.dumpLocation(expr, filePath)
-            );
-
-            debuglog('Offending code block:\n%s', babel.transformFromAst(expr).code);
+            doc.markAsExported();
+            parser.registry.trackModuleDocAtPath(doc, modulePath);
           }
         }
+        else {
+          console.warn(
+            'Unable to identify exported module id. ' +
+            'This probably means you are using an unnamed `module.exports`.' +
+            ' (source: %s)',
+            ASTUtils.dumpLocation(expr, filePath)
+          );
+
+          debuglog('Offending code block:\n%s', babel.transformFromAst(expr).code);
+        }
       }
     },
   });
 };
 
-Ppt.seal = function(config) {
-  PostProcessor.run(this.registry, config);
-};
-
 Ppt.toJSON = function() {
-  return this.registry.docs.map(function(doc) {
-    return doc.toJSON();
-  });
-};
+  var registry = this.registry;
 
-Ppt.parseComment = function(comment, path, contextNode, config, filePath, absoluteFilePath) {
-  var nodeInfo, doc;
+  return registry.docs.reduce(function(list, doc) {
+    // We don't care about modules that @lend
+    if (!doc.docstring.doesLend()) {
+      list.push(doc.toJSON(registry));
+    }
+
+    return list;
+  }, []);
+};
 
-  var docstring = new Docstring('/*' + comment + '*/', config, absoluteFilePath);
+Ppt.parseComment = function(comment, path, contextNode, config, filePath) {
+  var nodeLocation = ASTUtils.dumpLocation(contextNode, filePath);
+  var docstring = new Docstring('/*' + comment + '*/', config, nodeLocation);
 
   if (docstring.isInternal()) {
     return false;
@@ -197,40 +196,89 @@ Ppt.parseComment = function(comment, path, contextNode, config, filePath, absolu
     this.registry.trackLend(docstring.getLentTo(), path);
   }
 
-  runAllSync(config.docstringProcessors || [], [ docstring ]);
+  var predefinedNamespace = getPredefinedNamespace(config, docstring, filePath);
+
+  if (predefinedNamespace) {
+    if (docstring.namespace) {
+      console.warn("Ignoring pre-defined namespace '%s' for module as it already specifies one ('%s'). (Source: '%s')",
+        predefinedNamespace,
+        docstring.namespace,
+        nodeLocation
+      );
+    }
+    else {
+      docstring.namespace = predefinedNamespace;
+    }
+  }
 
-  nodeInfo = NodeAnalyzer.analyze(contextNode, path, filePath, config);
+  if (config.docstringProcessors && config.docstringProcessors.length) {
+    runAllSync(config.docstringProcessors, [ docstring ]);
+  }
 
-  doc = new Doc(docstring, nodeInfo, filePath, absoluteFilePath);
+  var nodeInfo = NodeAnalyzer.analyze(contextNode, path, filePath, config);
+  var doc = new Doc(docstring, nodeInfo, filePath);
 
+  // Pre-defined aliases:
   if (config.alias.hasOwnProperty(doc.id)) {
-    config.alias[doc.id].forEach(doc.addAlias.bind(doc));
+    config.alias[doc.id].forEach(function(alias) {
+      doc.docstring.addAlias(alias);
+    });
   }
 
-  docstring.tags.forEach(function(tag) {
-    runAllSync(config.tagProcessors || [], [ tag ]);
-  });
+  if (config.tagProcessors && config.tagProcessors.length) {
+    docstring.tags.forEach(function(tag) {
+      runAllSync(config.tagProcessors, [ tag ]);
+    });
+  }
 
   if (doc.id) {
     if (doc.isModule()) {
-      var modulePath = Utils.findNearestPathWithComments(path);
+      var modulePath = ASTUtils.findNearestPathWithComments(path);
 
-      // console.log('\tFound a module "%s" (source: %s)', doc.id, nodeInfo.fileLoc);
+      if (process.env.VERBOSE) {
+        console.log('\tFound a module "%s" (source: %s)', doc.id, nodeLocation);
+      }
 
       this.registry.addModuleDoc(doc, modulePath, filePath);
     }
     else {
       this.registry.addEntityDoc(doc, path);
 
-      // console.log('\tFound an entity "%s" belonging to "%s" (source: %s)',
-      //   doc.id,
-      //   doc.getReceiver(),
-      //   nodeInfo.fileLoc
-      // );
+      if (process.env.VERBOSE) {
+        console.log('\tFound an entity "%s" belonging to "%s" (source: %s)',
+          doc.id,
+          doc.nodeInfo.receiver || '<<unknown>>',
+          nodeLocation
+        );
+      }
     }
   }
+  else {
+    console.warn("No identifier was found for this document, it will be ignored! (Source: %s)",
+      nodeLocation
+    );
+  }
 
   return true;
 };
 
+function getPredefinedNamespace(config, docstring, filePath) {
+  var namespace;
+
+  if (config.namespaceDirMap) {
+    var namespaceDirMap = Object.keys(config.namespaceDirMap);
+    var dirName = nodejsPath.dirname(filePath);
+
+    namespaceDirMap.some(function(pattern) {
+      if (dirName.match(pattern)) {
+        namespace = config.namespaceDirMap[pattern];
+
+        return true;
+      }
+    });
+  }
+
+  return namespace && namespace.length > 0 ? namespace : null;
+}
+
 module.exports = Parser;
\ No newline at end of file
diff --git a/packages/megadoc-plugin-js/lib/Parser/parseComment.js b/packages/megadoc-plugin-js/lib/Parser/parseComment.js
new file mode 100644
index 00000000..6babfabf
--- /dev/null
+++ b/packages/megadoc-plugin-js/lib/Parser/parseComment.js
@@ -0,0 +1,33 @@
+var parseComment = require('comment-parser/parser.js');
+var neutralizeWhitespace = require('megadoc-docstring/lib/utils/neutralizeWhitespace');
+var RE_TRIM_SURROUNDING_NEWLINES = /^\n+|\n+$/g;
+var RE_HAS_STUFF = /\S/;
+var parserOptions = {
+  trim: false,
+  parsers: [
+    parseComment.PARSERS.parse_tag,
+    parseComment.PARSERS.parse_type,
+    parseComment.PARSERS.parse_name,
+    parseDescription
+  ]
+};
+
+module.exports = function(str) {
+  return parseComment(str, parserOptions);
+};
+
+function parseDescription(str, data) {
+  if (data.errors && data.errors.length) { return null; }
+
+  if (str.match(RE_HAS_STUFF)) {
+    return {
+      source: str,
+      data: {
+        description: neutralizeWhitespace(str).replace(RE_TRIM_SURROUNDING_NEWLINES, '')
+      }
+    };
+  }
+  else {
+    return null;
+  }
+};
diff --git a/packages/megadoc-plugin-js/lib/__tests__/index--integration.test.js b/packages/megadoc-plugin-js/lib/__tests__/index--integration.test.js
index 8051d9ab..1425bba8 100644
--- a/packages/megadoc-plugin-js/lib/__tests__/index--integration.test.js
+++ b/packages/megadoc-plugin-js/lib/__tests__/index--integration.test.js
@@ -33,6 +33,7 @@ describe("[Integration] megadoc-plugin-js", function() {
     suite.createFile('lib/core/Store.js', function() {;
       // /**
       //  * @module
+      //  *
       //  * dis be our store, mon!
       //  */
       // function Store() {}
diff --git a/packages/megadoc-plugin-js/lib/__tests__/render.test.js b/packages/megadoc-plugin-js/lib/__tests__/render.test.js
index 7fcace56..828ba955 100644
--- a/packages/megadoc-plugin-js/lib/__tests__/render.test.js
+++ b/packages/megadoc-plugin-js/lib/__tests__/render.test.js
@@ -8,7 +8,7 @@ var reduceDocuments = require('../reduce');
 describe('cjs::render', function() {
   var database;
   var sinon = sinonSuite(this);
-  var renderMarkdown, linkify;
+  var renderMarkdown, linkify, renderLink, compiler;
 
   beforeEach(function() {
     database = TestUtils.parseInline(function() {;
@@ -26,23 +26,32 @@ describe('cjs::render', function() {
       //  * @param {String} id
       //  *        A _unique_ record identifier.
       //  *
+      //  * @param {Foo|null}
       //  * @example
       //  *
       //  * Hello!
       //  */
-      // Cache.prototype.add = function(id) {
+      // Cache.prototype.add = function(id, foo) {
       // };
+      //
+      // /**
+      //  * @module Foo
+      //  */
+      //  function Foo() {}
     });
 
     renderMarkdown = sinon.stub().returnsArg(0);
     linkify = sinon.spy(function(x) { return x.text; });
+    compiler = createCompiler();
+
+    renderLink = sinon.spy(compiler.linkResolver, 'renderLink');
 
-    render(createCompiler(), reduceDocuments({
+    render(compiler, reduceDocuments({
       documents: database,
       namespaceId: 'test',
       namespaceTitle: 'JavaScript Test',
       baseURL: '/test',
-    }), renderMarkdown, linkify);
+    }), renderMarkdown, linkify, {});
   });
 
   it('renders doc.description', function() {
@@ -63,7 +72,7 @@ describe('cjs::render', function() {
     assert.calledWith(renderMarkdown, 'A _unique_ record identifier.');
   });
 
-  it('renders the "string" of an @example tag', function() {
+  it.skip('renders the "string" of an @example tag', function() {
     assert.calledWith(linkify, sinon.match({
       text: '\nHello!',
       contextNode: sinon.match({ id: '#add' })
@@ -71,4 +80,15 @@ describe('cjs::render', function() {
 
     assert.calledWith(renderMarkdown, '\nHello!');
   });
+
+  describe('tag rendering', function() {
+    it('linkifies custom types', function() {
+      assert.calledWith(renderLink, sinon.match({
+        strict: true,
+        contextNode: sinon.match({ id: '#add' }),
+      }), sinon.match({
+        path: 'Foo',
+      }));
+    });
+  });
 });
\ No newline at end of file
diff --git a/packages/megadoc-plugin-js/lib/config.js b/packages/megadoc-plugin-js/lib/config.js
index 415ec40c..f8b8db12 100644
--- a/packages/megadoc-plugin-js/lib/config.js
+++ b/packages/megadoc-plugin-js/lib/config.js
@@ -9,14 +9,14 @@ module.exports = {
    *           plugins in your megadoc config.)
    *
    *           This will be used in the corpus to namespace documents and may
-   *           affect the URL if you leave [@baseURL]() blank.
+   *           affect the URL if you leave [.baseURL]() blank.
    */
   id: 'js',
 
   /**
    * @property {String}
    *           The URL to reach the JavaScript documentation at.
-   *           The default is to infer it from [@id]().
+   *           The default is to infer it from [.id]().
    */
   baseURL: null,
 
@@ -94,6 +94,8 @@ module.exports = {
 
   verbose: false,
 
+  strict: true,
+
   /**
    * @property {Object.<String, String|Array.<String>>}
    *
@@ -179,4 +181,45 @@ module.exports = {
    * part of the description for their respective tags.
    */
   namedReturnTags: true,
+
+  /**
+   * @property {Array.<String>}
+   *
+   * A list of types to consider "built-in" and to avoid linking to.
+   *
+   * This list will be munged along with the following built-in types:
+   *
+   * ```javascript
+   * [
+   *   'Error',
+   *   'String',
+   *   'Array',
+   *   'Number',
+   *   'RegExp',
+   *   'Object',
+   *   'Boolean',
+   *   'Date',
+   *   'Function',
+   *   'Symbol',
+   *   'Promise',
+   *   'Map',
+   *   'Set',
+   *   'WeakMap',
+   *   'WeakSet',
+   *   'Buffer',
+   *   'Uint16Array',
+   *   'ArrayBuffer',
+   *   'DataView',
+   *   'Int8Array',
+   *   'Uint8Array',
+   *   'Uint8ClampedArray',
+   *   'Uint32Array',
+   *   'Int32Array',
+   *   'Float32Array',
+   *   'Int16Array',
+   *   'Float64Array'
+   * ]
+   * ```
+   */
+  builtInTypes: []
 };
\ No newline at end of file
diff --git a/packages/megadoc-plugin-js/lib/index.js b/packages/megadoc-plugin-js/lib/index.js
index 97e42545..2cad619f 100644
--- a/packages/megadoc-plugin-js/lib/index.js
+++ b/packages/megadoc-plugin-js/lib/index.js
@@ -13,6 +13,7 @@ var reduceDocuments = require('./reduce');
 function Plugin(userConfig) {
   var config = assign({}, defaults, userConfig);
   var parserConfig = {
+    strict: config.strict,
     inferModuleIdFromFileName: config.inferModuleIdFromFileName,
     customTags: config.customTags,
     namespaceDirMap: config.namespaceDirMap,
@@ -30,6 +31,36 @@ function Plugin(userConfig) {
     "You must specify an @id to the megadoc-plugin-js plugin."
   );
 
+  if (config.builtInTypes) {
+    config.builtInTypes.forEach(function(x) {
+      if (x && typeof x === 'object') {
+        assert(typeof x.name === 'string',
+          'An object for a built-in type must define a @name string.');
+
+        assert(typeof x.href === 'string',
+          'An object for a built-in type must specify @href with a URL to the built-in type documentation');
+      }
+      else {
+        assert(typeof x === 'string',
+          'Built-in type must be either a string or an object, not "' + typeof x + '"');
+      }
+    });
+  }
+
+  Object.keys(config.alias).forEach(function(key) {
+    assert(Array.isArray(config.alias[key]),
+      "megadoc-plugin-js: OptionError: expected alias '" + key + "' entry to " +
+      " be an array, got '" + typeof config.alias[key] + "'."
+    );
+
+    config.alias[key].forEach(function(value) {
+      assert(typeof value === 'string',
+        "megadoc-plugin-js: OptionError: expected alias entry to be a string " +
+        ", not '" + typeof value + "' (key '" + key + "')"
+      );
+    });
+  });
+
   var plugin = {
     id: config.id,
 
@@ -107,7 +138,7 @@ function Plugin(userConfig) {
       });
 
       compiler.on('render', function(renderMarkdown, linkify, done) {
-        render(compiler, database, renderMarkdown, linkify);
+        render(compiler, database, renderMarkdown, linkify, config);
 
         done();
       });
diff --git a/packages/megadoc-plugin-js/lib/reduce.js b/packages/megadoc-plugin-js/lib/reduce.js
index 32dfcc64..90882d21 100644
--- a/packages/megadoc-plugin-js/lib/reduce.js
+++ b/packages/megadoc-plugin-js/lib/reduce.js
@@ -63,9 +63,10 @@ module.exports = function reduceDocuments(options) {
   function reduceModuleDocument(doc) {
     return b.document({
       id: doc.name,
-      title: doc.path,
+      title: doc.id,
       summary: generateSummary(doc),
-      filePath: doc.absoluteFilePath,
+      filePath: doc.filePath,
+      loc: doc.loc,
       symbol: '',
       properties: doc,
       documents: rawDocuments.filter(function(x) {
@@ -79,10 +80,11 @@ module.exports = function reduceDocuments(options) {
 
   function reduceEntityDocument(parentDoc, doc) {
     return b.documentEntity({
-      id: doc.ctx.symbol + doc.name,
-      title: doc.path,
+      id: doc.symbol + doc.name,
+      title: doc.id,
       summary: generateSummary(doc),
-      filePath: doc.absoluteFilePath,
+      filePath: doc.filePath,
+      loc: doc.loc,
       properties: doc,
     });
   }
diff --git a/packages/megadoc-plugin-js/lib/render.js b/packages/megadoc-plugin-js/lib/render.js
index b347df9b..c6343ecf 100644
--- a/packages/megadoc-plugin-js/lib/render.js
+++ b/packages/megadoc-plugin-js/lib/render.js
@@ -1,4 +1,50 @@
-module.exports = function(compiler, namespaceNode, md, linkify) {
+var assert = require('assert');
+var K = require('./Parser/constants');
+var BUILT_IN_TYPES = [
+  'Error',
+  'String',
+  'Array',
+  'Number',
+  'RegExp',
+  'Object',
+  'Boolean',
+  'Date',
+  'Function',
+  'Symbol',
+  'Promise',
+  'Map',
+  'Set',
+  'WeakMap',
+  'WeakSet',
+  'Buffer',
+  'Uint16Array',
+  'ArrayBuffer',
+  'DataView',
+  'Int8Array',
+  'Uint8Array',
+  'Uint8ClampedArray',
+  'Uint32Array',
+  'Int32Array',
+  'Float32Array',
+  'Int16Array',
+  'Float64Array'
+];
+
+var EXPRESSION_TYPES = Object.freeze([
+  K.TYPE_UNION,
+  K.TYPE_ALL_LITERAL,
+  K.TYPE_UNKNOWN_LITERAL,
+  K.TYPE_UNKNOWN,
+  K.TYPE_FUNCTION,
+  K.TYPE_OBJECT,
+  K.TYPE_OBJECT_PROPERTY
+].reduce(function(map, x) { map[x] = true; return map; }, {}));
+
+var TAGS_WITH_STRING = K.TAGS_WITH_STRINGS;
+
+module.exports = function(compiler, namespaceNode, md, linkify, config) {
+  var builtInTypes = BUILT_IN_TYPES.concat(config.builtInTypes || []).reduce(toIndexMap, {});
+
   namespaceNode.documents.forEach(visitNode);
 
   function visitNode(node) {
@@ -22,7 +68,7 @@ module.exports = function(compiler, namespaceNode, md, linkify) {
       doc.description = md(linkify({
         text: doc.description,
         contextNode: node,
-      }));
+      }), { contextNode: node, });
     }
 
     if (doc.mixinTargets) {
@@ -39,14 +85,10 @@ module.exports = function(compiler, namespaceNode, md, linkify) {
         return {
           uid: target.uid,
           name: typeName,
-          html: compiler.linkResolver.renderLink({
-            strict: true,
-            format: 'html',
+          html: renderTypeLink({
+            typeName: typeName,
+            linkResolver: compiler.linkResolver,
             contextNode: node,
-          }, {
-            path: typeName,
-            text: typeName,
-            source: typeName
           })
         };
       });
@@ -58,52 +100,102 @@ module.exports = function(compiler, namespaceNode, md, linkify) {
           tag.typeInfo.description = md(linkify({
             text: tag.typeInfo.description,
             contextNode: node,
-          }));
+          }), { contextNode: node, });
         }
 
-        if (tag.type === 'example') {
+        if (tag.type in TAGS_WITH_STRING) {
           tag.string = md(linkify({
             text: tag.string,
             contextNode: node,
-          }));
+          }), { contextNode: node, });
         }
-
         else if (tag.type === 'see') {
-          tag.string = md(
-            linkify({
-              text: '['+tag.string.trim()+']()',
-              contextNode: node,
-            }),
-            { trimHTML: true }
-          );
+          tag.typeInfo.name = renderTypeLink({
+            linkResolver: compiler.linkResolver,
+            contextNode: node,
+            typeName: tag.typeInfo.name.trim(),
+          });
         }
 
-        tag.typeInfo.types = tag.typeInfo.types.map(function(type) {
-          var typeStr = type;
-          var isArray;
-
-          if (type.match(/^Array\<(.*)\>$|^(.*)\[\]$/)) {
-            typeStr = RegExp.$1 || RegExp.$2;
-            isArray = true;
-          }
-
-          var linkedStr = md(
-            linkify({
-              text: '['+typeStr+']()',
-              contextNode: node,
-              strict: false
-            }),
-            { trimHTML: true }
-          );
-
-          if (isArray) {
-            linkedStr = 'Array&lt;' + linkedStr + '&gt;';
-          }
-
-          return linkedStr;
-        });
+        renderType(tag.typeInfo.type);
       });
     }
 
+    function renderType(type) {
+      if (!type) {
+        return;
+      }
+
+      var isExpression = type.name in EXPRESSION_TYPES;
+
+      if (type.name && !isExpression) {
+        type.html = renderTypeLink({
+          linkResolver: compiler.linkResolver,
+          typeName: type.name,
+          contextNode: node,
+        });
+      }
+
+      // UnionType, TypeApplication
+      if (type.elements) {
+        type.elements.forEach(renderType);
+      }
+
+      // RecordType
+      if (type.key) {
+        renderType(type.key);
+      }
+      if (type.value) {
+        renderType(type.value);
+      }
+
+      // FunctionType
+      if (type.params) {
+        type.params.forEach(renderType);
+      }
+      if (type.returnValue) {
+        renderType(type.returnValue);
+      }
+    }
+  }
+
+  function renderTypeLink(params) {
+    var typeName = params.typeName;
+    var builtInType = builtInTypes[typeName.toLowerCase()];
+
+    if (builtInType) {
+      if (typeof builtInType === 'string') {
+        return '<a href="' + encodeURI(builtInType) + '">' + typeName + '</a>';
+      }
+
+      return typeName;
+    }
+
+    return params.linkResolver.renderLink({
+      strict: true,
+      format: 'html',
+      contextNode: params.contextNode,
+    }, {
+      path: typeName,
+      text: typeName,
+      source: typeName
+    })
+  }
+};
+
+function toIndexMap(map, x) {
+  if (typeof x === 'string') {
+    map[x.toLowerCase()] = true;
+  }
+  else if (x && typeof x === 'object') {
+    assert(typeof x.name === 'string');
+    assert(typeof x.href === 'string');
+
+    map[x.name.toLowerCase()] = x.href;
   }
-};
\ No newline at end of file
+  else {
+    assert(false);
+  }
+
+  return map;
+}
\ No newline at end of file
diff --git a/packages/megadoc-plugin-js/lib/scan.js b/packages/megadoc-plugin-js/lib/scan.js
index d33edac2..7532c600 100644
--- a/packages/megadoc-plugin-js/lib/scan.js
+++ b/packages/megadoc-plugin-js/lib/scan.js
@@ -1,4 +1,5 @@
 var Parser = require('./Parser');
+var K = require('./Parser/constants');
 
 module.exports = function scan(params, done) {
   var database;
@@ -16,8 +17,6 @@ module.exports = function scan(params, done) {
     parser.parseFile(filePath, parserConfig, params.assetRoot);
   });
 
-  parser.seal(parserConfig);
-
   database = parser.toJSON();
 
   if (parserConfig.postProcessors) {
@@ -26,5 +25,40 @@ module.exports = function scan(params, done) {
     });
   }
 
+  warnAboutOrphans(database);
+  warnAboutUnknownContexts(database);
+
   done(null, database);
 };
+
+
+function warnAboutOrphans(database) {
+  var ids = database.reduce(function(map, doc) {
+    map[doc.id] = true;
+    return map;
+  }, {});
+
+  database.forEach(function(doc) {
+    if (!doc.isModule && (!doc.receiver || !(doc.receiver in ids))) {
+      console.warn(
+        'Unable to map "%s" to any module, it will be discarded. (Source: %s:%s)',
+        doc.id,
+        doc.filePath,
+        doc.line
+      );
+    }
+  })
+}
+
+function warnAboutUnknownContexts(database) {
+  database.forEach(function(doc) {
+    if (doc.type === K.TYPE_UNKNOWN) {
+      console.info(
+        'Entity "%s" has no context. This probably means megadoc does not know ' +
+        'how to handle it yet. (Source: %s:%s)',
+        doc.id,
+        doc.filePath, doc.line
+      );
+    }
+  });
+}
\ No newline at end of file
diff --git a/packages/megadoc-plugin-js/lib/utils/runAllSync.js b/packages/megadoc-plugin-js/lib/utils/runAllSync.js
index 5aacb2d0..57c970d0 100644
--- a/packages/megadoc-plugin-js/lib/utils/runAllSync.js
+++ b/packages/megadoc-plugin-js/lib/utils/runAllSync.js
@@ -1,7 +1,8 @@
 module.exports = function runAllSync(runners, runnerArgs) {
   var i, runner;
+  var len = runners.length;
 
-  for (i = 0; i < runners.length; ++i) {
+  for (i = 0; i < len; ++i) {
     runner = runners[i];
     runner.apply(runner, runnerArgs);
   }
diff --git a/packages/megadoc-plugin-js/package.json b/packages/megadoc-plugin-js/package.json
index 290081ff..77dffb47 100644
--- a/packages/megadoc-plugin-js/package.json
+++ b/packages/megadoc-plugin-js/package.json
@@ -23,17 +23,14 @@
   },
   "homepage": "https://github.com/megadoc/megadoc#readme",
   "dependencies": {
-    "babel-core": "6.7.6",
-    "babel-types": "6.7.2",
-    "dox": "0.8.1",
+    "babel-types": "6.9.0",
+    "catharsis": "0.8.8",
+    "comment-parser": "0.4.0",
     "lodash": "3.10.1",
     "weakmap": "0.0.6",
     "weakset": "0.2.1"
   },
   "peerDependencies": {
     "megadoc": "5.x"
-  },
-  "devDependencies": {
-    "babel-preset-react": "6.5.0"
   }
 }
diff --git a/packages/megadoc-plugin-js/ui/components/ClassBrowser.js b/packages/megadoc-plugin-js/ui/components/ClassBrowser.js
index ff688ec2..b5906345 100644
--- a/packages/megadoc-plugin-js/ui/components/ClassBrowser.js
+++ b/packages/megadoc-plugin-js/ui/components/ClassBrowser.js
@@ -4,11 +4,12 @@ const classSet = require('utils/classSet');
 const Storage = require('core/Storage');
 const Checkbox = require('components/Checkbox');
 const HotItemIndicator = require('components/HotItemIndicator');
-const { findWhere, sortBy } = require('lodash');
+const { sortBy } = require('lodash');
 const isItemHot = require('utils/isItemHot');
 const K = require('../constants');
 const PRIVATE_VISIBILITY_KEY = K.CFG_CLASS_BROWSER_SHOW_PRIVATE;
 const orderAwareSort = require('../utils/orderAwareSort');
+const DocClassifier = require('../utils/DocClassifier');
 const { object, bool, } = React.PropTypes;
 
 var ClassBrowser = React.createClass({
@@ -109,6 +110,12 @@ var ClassBrowser = React.createClass({
 
   renderModule(docNode) {
     const doc = docNode.properties;
+    const isPrivate = DocClassifier.isPrivate(doc);
+
+    if (isPrivate && !Storage.get(PRIVATE_VISIBILITY_KEY)) {
+      return null;
+    }
+
     const { id } = doc;
     const isActive = this.props.documentNode === docNode;
     const className = classSet({
@@ -116,12 +123,6 @@ var ClassBrowser = React.createClass({
       'class-browser__entry--active': isActive
     });
 
-    const isPrivate = doc.isPrivate;
-
-    if (isPrivate && !Storage.get(PRIVATE_VISIBILITY_KEY)) {
-      return null;
-    }
-
     return (
       <div key={docNode.uid} className={className}>
         <Link ref={id} to={docNode} className="class-browser__entry-link">
@@ -144,19 +145,11 @@ var ClassBrowser = React.createClass({
       return null;
     }
 
-    const moduleDoc = documentNode.properties;
-    const methodDocs = documentNode.entities.filter(function(x) {
-      return x.properties.ctx.type === K.TYPE_FUNCTION;
-    });
-
-    const propertyDocs = documentNode.entities.filter(function(x) {
-      return !!findWhere(x.properties.tags, { type: 'property' });
-    });
+    const entityDocuments = orderAwareSort.asNodes(documentNode, documentNode.entities, 'id');
 
     return (
       <ul className="class-browser__methods">
-        {orderAwareSort(moduleDoc, methodDocs, 'id').map(this.renderEntity)}
-        {orderAwareSort(moduleDoc, propertyDocs, 'id').map(this.renderEntity)}
+        {entityDocuments.map(this.renderEntity)}
       </ul>
     );
   },
@@ -166,7 +159,7 @@ var ClassBrowser = React.createClass({
       <li key={node.uid} className="class-browser__methods-entity">
         <Link
           to={node}
-          children={(node.properties.ctx.symbol || '') + node.properties.name}
+          children={(node.properties.symbol || '') + node.properties.name}
           title={node.title}
         />
       </li>
diff --git a/packages/megadoc-plugin-js/ui/components/Doc.js b/packages/megadoc-plugin-js/ui/components/Doc.js
index bbd34b9a..e0b08aaa 100644
--- a/packages/megadoc-plugin-js/ui/components/Doc.js
+++ b/packages/megadoc-plugin-js/ui/components/Doc.js
@@ -4,6 +4,9 @@ const HighlightedText = require('components/HighlightedText');
 const DocTags = require('./DocTags');
 const FunctionSignature = require('./FunctionSignature');
 const TypeNames = require('./Tags/TypeNames');
+const DeprecatedTag = require('./Tags/DeprecatedTag');
+const K = require('../constants');
+const DocClassifier = require('../utils/DocClassifier');
 const Collapsible = require('mixins/Collapsible');
 const { object, bool, string } = React.PropTypes;
 const HeadingAnchor = require('components/HeadingAnchor');
@@ -49,6 +52,7 @@ const Doc = React.createClass({
 
     const { doc, anchor } = this.props;
     const description = doc.description;
+    const deprecatedTag = doc.tags.filter((t) => t.type === 'deprecated')[0];
 
     return (
       <div className={className}>
@@ -83,22 +87,30 @@ const Doc = React.createClass({
                 <span className="doc-entity__modifier">CONSTRUCTOR</span>
               )}
 
-              {doc.isProtected && (
+              {DocClassifier.isProtected(doc) && (
                 <span className="doc-entity__modifier doc-entity__protected">PROTECTED</span>
               )}
 
-              {doc.isPrivate && (
+              {DocClassifier.isPrivate(doc) && (
                 <span className="doc-entity__modifier doc-entity__private">PRIVATE</span>
               )}
 
               {doc.tags.some((t) => t.type === 'async') && (
                 <span className="doc-entity__modifier doc-entity__async">ASYNC</span>
               )}
+
+              {deprecatedTag && (
+                <span className="doc-entity__modifier doc-entity__async">DEPRECATED</span>
+              )}
             </HeadingAnchor.Text>
           </h4>
         )}
 
         <div className="doc-entity__description">
+          {deprecatedTag && deprecatedTag.string.length && (
+            <DeprecatedTag string={deprecatedTag.string} />
+          )}
+
           {this.props.withDescription && description && !isCollapsed && (
             <HighlightedText>
               {description}
@@ -127,14 +139,14 @@ const Doc = React.createClass({
     return (
       <span className="doc-entity__method-params">
         {' -> '}
-        <TypeNames types={tag.typeInfo.types} />
+        <TypeNames type={tag.typeInfo.type} />
       </span>
     );
   }
 });
 
 function isFunction(doc) {
-  return doc.ctx.type === 'function';
+  return doc.type === K.TYPE_FUNCTION;
 }
 
 module.exports = Doc;
\ No newline at end of file
diff --git a/packages/megadoc-plugin-js/ui/components/FunctionSignature.js b/packages/megadoc-plugin-js/ui/components/FunctionSignature.js
index 1d1a3644..27254735 100644
--- a/packages/megadoc-plugin-js/ui/components/FunctionSignature.js
+++ b/packages/megadoc-plugin-js/ui/components/FunctionSignature.js
@@ -1,5 +1,6 @@
 const React = require('react');
 const { bool, object, } = React.PropTypes;
+const describeType = require('../utils/describeType');
 
 const FunctionSignature = React.createClass({
   propTypes: {
@@ -23,10 +24,10 @@ const FunctionSignature = React.createClass({
       })
       .map(function(param) {
         if (withNames) {
-          return '<em>' + param.typeInfo.name + '</em>: ' + param.typeInfo.types.join('|');
+          return '<em>' + param.typeInfo.name + '</em>: ' + describeType(param.typeInfo.type);
         }
         else {
-          return param.typeInfo.types.join('|');
+          return describeType(param.typeInfo.type);
         }
       }).join(', ')
     ;
diff --git a/packages/megadoc-plugin-js/ui/components/ModuleBody.js b/packages/megadoc-plugin-js/ui/components/ModuleBody.js
index d2bf8694..8d6ff1d7 100644
--- a/packages/megadoc-plugin-js/ui/components/ModuleBody.js
+++ b/packages/megadoc-plugin-js/ui/components/ModuleBody.js
@@ -142,7 +142,7 @@ const ModuleBody = React.createClass({
 
   renderSeeTag(tag) {
     return (
-      <SeeTag key={tag.string} string={tag.string} />
+      <SeeTag key={tag.typeInfo.name} {...tag} />
     );
   },
 
@@ -152,9 +152,9 @@ const ModuleBody = React.createClass({
       moduleDocs.filter(function(entityDoc) {
 
         return (
-          (scope ? scope(entityDoc.ctx.scope) : true) &&
+          (scope ? scope(entityDoc.nodeInfo.scope) : true) &&
           (
-            entityDoc.ctx.type === K.TYPE_LITERAL ||
+            entityDoc.nodeInfo.type === K.TYPE_LITERAL ||
             entityDoc.tags.some(x => x.type === 'property')
           )
         );
@@ -179,7 +179,7 @@ const ModuleBody = React.createClass({
       findWhere(doc.tags, { type: 'type' }) || {
         typeInfo: {
           name: doc.name,
-          types: [ doc.ctx.type ]
+          type: { name: doc.type }
         }
       }
     );
diff --git a/packages/megadoc-plugin-js/ui/components/ModuleHeader.js b/packages/megadoc-plugin-js/ui/components/ModuleHeader.js
index 1a71535d..f09eecc4 100644
--- a/packages/megadoc-plugin-js/ui/components/ModuleHeader.js
+++ b/packages/megadoc-plugin-js/ui/components/ModuleHeader.js
@@ -34,18 +34,13 @@ const ModuleHeader = React.createClass({
     const { documentNode } = this.props;
     const doc = documentNode.properties || {
       name: documentNode.title,
-      ctx: { type: K.TYPE_UNKNOWN }
+      type: K.TYPE_UNKNOWN
     };
 
     if (this.props.generateAnchor) {
       anchor = documentNode.meta.anchor;
     }
 
-
-    if (!doc.ctx) {
-      return <header>Unsupported Entity</header>;
-    }
-
     return (
       <div>
         <Heading
diff --git a/packages/megadoc-plugin-js/ui/components/ModuleIndex.js b/packages/megadoc-plugin-js/ui/components/ModuleIndex.js
index bcf36151..11d293d0 100644
--- a/packages/megadoc-plugin-js/ui/components/ModuleIndex.js
+++ b/packages/megadoc-plugin-js/ui/components/ModuleIndex.js
@@ -104,18 +104,18 @@ const ModuleIndex = React.createClass({
 
     const returnValue = documentNode.properties.tags.reduce((v, x) => {
       if (x.type === 'return') {
-        return x.typeInfo.types;
+        return x.typeInfo.type;
       }
       else {
         return v;
       }
-    }, ['void']);
+    }, { name: 'void' });
 
     return (
       <tr key={documentNode.uid}>
         <td>
           <span className="doc-entity__function-signature">
-            {returnValue && <TypeNames types={returnValue} />}
+            {returnValue && <TypeNames type={returnValue} />}
           </span>
         </td>
 
@@ -157,7 +157,7 @@ const ModuleIndex = React.createClass({
       <tr key={documentNode.uid}>
         <td>
           <span className="doc-entity__function-signature">
-            <TypeNames types={propertyTag.typeInfo.types} />
+            <TypeNames type={propertyTag.typeInfo.type} />
           </span>
         </td>
 
diff --git a/packages/megadoc-plugin-js/ui/components/TabularTagGroup.js b/packages/megadoc-plugin-js/ui/components/TabularTagGroup.js
index 514cd583..5bbbc861 100644
--- a/packages/megadoc-plugin-js/ui/components/TabularTagGroup.js
+++ b/packages/megadoc-plugin-js/ui/components/TabularTagGroup.js
@@ -3,6 +3,7 @@ var { where } = require('lodash');
 var Collapsible = require('mixins/Collapsible');
 var classSet = require('utils/classSet');
 var TypeNames = require('./Tags/TypeNames');
+var DefaultValue = require('./Tags/DefaultValue');
 var HighlightedText = require('components/HighlightedText');
 
 var TabularTagGroup = React.createClass({
@@ -88,15 +89,9 @@ var TabularTagGroup = React.createClass({
         </td>
 
         <td>
-          {typeInfo.types.length > 0 && (
+          {typeInfo.type && (
             <code className="param-tag__types">
-              <TypeNames types={typeInfo.types} />
-
-              {typeInfo.defaultValue && (
-                <span className="param-tag__default-value">
-                  {' ('}defaults to: <code>{typeInfo.defaultValue}</code>)
-                </span>
-              )}
+              <TypeNames type={typeInfo.type} />
             </code>
           )}
 
@@ -105,6 +100,8 @@ var TabularTagGroup = React.createClass({
               {typeInfo.description.replace(/[ ]{4,}/g, '')}
             </HighlightedText>
           )}
+
+          <DefaultValue defaultValue={typeInfo.defaultValue} />
         </td>
       </tr>
     );
diff --git a/packages/megadoc-plugin-js/ui/components/Tags/DefaultValue.js b/packages/megadoc-plugin-js/ui/components/Tags/DefaultValue.js
new file mode 100644
index 00000000..2c2b5177
--- /dev/null
+++ b/packages/megadoc-plugin-js/ui/components/Tags/DefaultValue.js
@@ -0,0 +1,22 @@
+const React = require('react');
+const DefaultValue = React.createClass({
+  propTypes: {
+    defaultValue: React.PropTypes.string,
+  },
+
+  render() {
+    const { defaultValue } = this.props;
+
+    if (!defaultValue) {
+      return null;
+    }
+
+    return (
+      <p className="property-tag__default-value">
+        Defaults to: <code>{defaultValue}</code>
+      </p>
+    );
+  }
+});
+
+module.exports = DefaultValue;
diff --git a/packages/megadoc-plugin-js/ui/components/Tags/DeprecatedTag.js b/packages/megadoc-plugin-js/ui/components/Tags/DeprecatedTag.js
new file mode 100644
index 00000000..7b24fbe2
--- /dev/null
+++ b/packages/megadoc-plugin-js/ui/components/Tags/DeprecatedTag.js
@@ -0,0 +1,18 @@
+var React = require("react");
+var DeprecatedTag = React.createClass({
+  propTypes: {
+    string: React.PropTypes.string.isRequired
+  },
+
+  render() {
+    return (
+      <blockquote className="blockquote--warning">
+        <p><strong>Deprecated</strong></p>
+
+        {this.props.string}
+      </blockquote>
+    );
+  }
+});
+
+module.exports = DeprecatedTag;
\ No newline at end of file
diff --git a/packages/megadoc-plugin-js/ui/components/Tags/ExampleTag.js b/packages/megadoc-plugin-js/ui/components/Tags/ExampleTag.js
index d9c40384..e499e90b 100644
--- a/packages/megadoc-plugin-js/ui/components/Tags/ExampleTag.js
+++ b/packages/megadoc-plugin-js/ui/components/Tags/ExampleTag.js
@@ -19,16 +19,14 @@ const ExampleTag = React.createClass({
 
     return (
       <div className="example-tag">
-        <p>
-          {name && (
-            <div>
-              <strong>Example: </strong>
-              <span dangerouslySetInnerHTML={{ __html: name }} />
-            </div>
-          )}
-
-          {!name && (<strong>Example</strong>)}
-        </p>
+        {name && (
+          <p>
+            <strong>Example: </strong>
+            <span dangerouslySetInnerHTML={{ __html: name }} />
+          </p>
+        )}
+
+        {!name && (<p><strong>Example</strong></p>)}
 
         <HighlightedText className="example-tag__code">
           {description}
diff --git a/packages/megadoc-plugin-js/ui/components/Tags/ParamTag.js b/packages/megadoc-plugin-js/ui/components/Tags/ParamTag.js
index a2b34314..77d94e83 100644
--- a/packages/megadoc-plugin-js/ui/components/Tags/ParamTag.js
+++ b/packages/megadoc-plugin-js/ui/components/Tags/ParamTag.js
@@ -1,6 +1,7 @@
 var React = require("react");
 var HighlightedText = require('components/HighlightedText');
 var TypeNames = require('./TypeNames');
+var DefaultValue = require('./DefaultValue');
 
 var ParamTag = React.createClass({
   displayName: "ParamTag",
@@ -8,7 +9,7 @@ var ParamTag = React.createClass({
   propTypes: {
     withTitle: React.PropTypes.bool,
     typeInfo: React.PropTypes.shape({
-      types: React.PropTypes.arrayOf(React.PropTypes.string),
+      type: React.PropTypes.object,
       name: React.PropTypes.string,
       defaultValue: React.PropTypes.string,
       description: React.PropTypes.string
@@ -31,17 +32,11 @@ var ParamTag = React.createClass({
 
           <code className="param-tag__name">{typeInfo.name}</code>
 
-          {typeInfo.types.length > 0 && (
+          {typeInfo.type && (
             <code className="param-tag__types">
               {': '}
 
-              <TypeNames types={typeInfo.types} />
-
-              {typeInfo.defaultValue && (
-                <span className="param-tag__default-value">
-                  {' ('}defaults to: <code>{typeInfo.defaultValue}</code>)
-                </span>
-              )}
+              <TypeNames type={typeInfo.type} />
             </code>
           )}
         </header>
@@ -51,6 +46,8 @@ var ParamTag = React.createClass({
             {typeInfo.description.replace(/[ ]{4,}/g, '')}
           </HighlightedText>
         )}
+
+        <DefaultValue defaultValue={typeInfo.defaultValue} />
       </li>
     );
   }
diff --git a/packages/megadoc-plugin-js/ui/components/Tags/PropertyTag.js b/packages/megadoc-plugin-js/ui/components/Tags/PropertyTag.js
index 7d830940..d407700f 100644
--- a/packages/megadoc-plugin-js/ui/components/Tags/PropertyTag.js
+++ b/packages/megadoc-plugin-js/ui/components/Tags/PropertyTag.js
@@ -2,9 +2,11 @@ const React = require("react");
 const HighlightedText = require('components/HighlightedText');
 const HeadingAnchor = require('components/HeadingAnchor');
 const TypeNames = require('./TypeNames');
+const DefaultValue = require('./DefaultValue');
 const Doc = require('../Doc');
+const describeNode = require('../../utils/describeNode');
 
-const { shape, string, arrayOf, object } = React.PropTypes;
+const { shape, string, object } = React.PropTypes;
 
 const PropertyTag = React.createClass({
   displayName: "PropertyTag",
@@ -12,7 +14,7 @@ const PropertyTag = React.createClass({
   propTypes: {
     anchor: string,
     typeInfo: shape({
-      types: arrayOf(string),
+      type: object,
       name: string,
       defaultValue: string,
       description: string
@@ -24,6 +26,7 @@ const PropertyTag = React.createClass({
   render() {
     const { typeInfo, doc } = this.props;
     const description = typeInfo.description || doc.description;
+    const defaultValue = typeInfo.defaultValue || describeNode(doc.nodeInfo);
 
     return (
       <li className="property-tag">
@@ -37,7 +40,7 @@ const PropertyTag = React.createClass({
 
           {': '}
 
-          <code><TypeNames types={typeInfo.types} /></code>
+          <code><TypeNames type={typeInfo.type} /></code>
         </header>
 
         {description && (
@@ -46,13 +49,11 @@ const PropertyTag = React.createClass({
           </HighlightedText>
         )}
 
-        {typeInfo.defaultValue && (
-          <p className="property-tag__default-value">
-            Defaults to: <code>{typeInfo.defaultValue}</code>
-          </p>
+        {defaultValue && (
+          <DefaultValue defaultValue={defaultValue} />
         )}
 
-        {this.props.doc && typeInfo.types[0].toLowerCase() === 'function' && (
+        {this.props.doc && typeInfo.type.name.toLowerCase() === 'function' && (
           <Doc
             withTitle={false}
             collapsible={false}
diff --git a/packages/megadoc-plugin-js/ui/components/Tags/ReturnTag.js b/packages/megadoc-plugin-js/ui/components/Tags/ReturnTag.js
index 8af32b0b..9d0c9eb0 100644
--- a/packages/megadoc-plugin-js/ui/components/Tags/ReturnTag.js
+++ b/packages/megadoc-plugin-js/ui/components/Tags/ReturnTag.js
@@ -8,7 +8,7 @@ var ReturnTag = React.createClass({
   propTypes: {
     withTitle: React.PropTypes.bool,
     typeInfo: React.PropTypes.shape({
-      types: React.PropTypes.arrayOf(React.PropTypes.string),
+      type: React.PropTypes.object,
       name: React.PropTypes.string,
       defaultValue: React.PropTypes.string,
       description: React.PropTypes.string
@@ -36,11 +36,11 @@ var ReturnTag = React.createClass({
 
           {hasName && <code className="return-tag__name">{typeInfo.name}</code>}
 
-          {typeInfo.types.length > 0 && (
+          {typeInfo.type && (
             <code className="return-tag__types">
               {hasName && ': '}
 
-              <TypeNames types={typeInfo.types} />
+              <TypeNames type={typeInfo.type} />
 
               {typeInfo.defaultValue && (
                 <span className="param-tag__default-value">
diff --git a/packages/megadoc-plugin-js/ui/components/Tags/SeeTag.js b/packages/megadoc-plugin-js/ui/components/Tags/SeeTag.js
index 5020048b..44c70594 100644
--- a/packages/megadoc-plugin-js/ui/components/Tags/SeeTag.js
+++ b/packages/megadoc-plugin-js/ui/components/Tags/SeeTag.js
@@ -1,17 +1,18 @@
-var React = require("react");
-var MarkdownText = require('components/MarkdownText');
-
-var SeeTag = React.createClass({
-  displayName: "SeeTag",
+const React = require("react");
+const MarkdownText = require('components/MarkdownText');
+const { shape, string } = React.PropTypes;
 
+const SeeTag = React.createClass({
   propTypes: {
-    string: React.PropTypes.string
+    typeInfo: shape({
+      name: string.isRequired
+    })
   },
 
   render() {
     return (
       <li className="see-tag">
-        <MarkdownText tagName="span">{this.props.string}</MarkdownText>
+        <MarkdownText tagName="span">{this.props.typeInfo.string}</MarkdownText>
       </li>
     );
   }
diff --git a/packages/megadoc-plugin-js/ui/components/Tags/ThrowsTag.js b/packages/megadoc-plugin-js/ui/components/Tags/ThrowsTag.js
index 739a723e..8e35b33e 100644
--- a/packages/megadoc-plugin-js/ui/components/Tags/ThrowsTag.js
+++ b/packages/megadoc-plugin-js/ui/components/Tags/ThrowsTag.js
@@ -2,12 +2,12 @@ const React = require("react");
 const HighlightedText = require('components/HighlightedText');
 const TypeNames = require('./TypeNames');
 
-const { shape, string, arrayOf } = React.PropTypes;
+const { shape, string, object } = React.PropTypes;
 
 const ThrowsTag = React.createClass({
   propTypes: {
     typeInfo: shape({
-      types: arrayOf(string),
+      type: object,
       description: string,
     }),
   },
@@ -16,7 +16,7 @@ const ThrowsTag = React.createClass({
     return (
       <li className="throws-tag">
         <p className="inline-block">
-          <TypeNames types={this.props.typeInfo.types} />
+          <TypeNames type={this.props.typeInfo.type} />
         </p>
 
         {' - '}
diff --git a/packages/megadoc-plugin-js/ui/components/Tags/TypeNames.js b/packages/megadoc-plugin-js/ui/components/Tags/TypeNames.js
index d56bd8ef..c816f157 100644
--- a/packages/megadoc-plugin-js/ui/components/Tags/TypeNames.js
+++ b/packages/megadoc-plugin-js/ui/components/Tags/TypeNames.js
@@ -1,8 +1,9 @@
 const React = require('react');
+const renderType = require('../../utils/describeType');
 
 const TypeNames = React.createClass({
   propTypes: {
-    types: React.PropTypes.arrayOf(React.PropTypes.string).isRequired
+    type: React.PropTypes.object.isRequired
   },
 
   render() {
@@ -10,11 +11,11 @@ const TypeNames = React.createClass({
       <span
         className="js-type-names"
         dangerouslySetInnerHTML={{
-          __html: this.props.types.join('|')
+          __html: renderType(this.props.type)
         }}
       />
     );
-  }
+  },
 });
 
 module.exports = TypeNames;
diff --git a/packages/megadoc-plugin-js/ui/components/__tests__/ClassBrowser.test.js b/packages/megadoc-plugin-js/ui/components/__tests__/ClassBrowser.test.js
new file mode 100644
index 00000000..4fd6835e
--- /dev/null
+++ b/packages/megadoc-plugin-js/ui/components/__tests__/ClassBrowser.test.js
@@ -0,0 +1,74 @@
+const Subject = require('../ClassBrowser');
+const reactSuite = require('test_helpers/reactSuite');
+const stubContext = require('test_helpers/stubContext');
+const { assert } = require('chai');
+const { drill, m } = require('react-drill');
+const Link = require('components/Link');
+
+describe('JS::Components::ClassBrowser', function() {
+  const suite = reactSuite(this, stubContext(Subject), {
+    namespaceNode: {
+      documents: [
+        {
+          uid: 'Cache',
+          title: 'Cache',
+          meta: {
+            href: '/Cache.html',
+          },
+          documents: [],
+          entities: [
+            {
+              uid: '#add',
+              meta: {
+                href: '/Cache.html##add',
+              },
+              properties: {
+                name: '#add'
+              }
+            }
+          ],
+          properties: {
+            name: 'Localized Cache Name',
+            tags: []
+          },
+        },
+        {
+          uid: 'CarBumper',
+          title: 'CarBumper',
+          meta: {
+            href: '/CarBumper.html',
+          },
+          documents: [],
+          entities: [],
+          properties: {
+            name: 'Localized CarBumper Name',
+            tags: [{
+              type: 'protected'
+            }]
+          },
+        }
+      ]
+    }
+  });
+
+  it('renders', function() {
+    assert.ok(subject.isMounted());
+  });
+
+  it('links to modules using their short-names', function() {
+    drill(subject).find(Link, m.hasText('Localized Cache Name'));
+    drill(subject).find(Link, m.hasText('Localized CarBumper Name'));
+  });
+
+  context('given an active module document...', function() {
+    beforeEach(function() {
+      suite.setProps({
+        documentNode: subject.props.namespaceNode.documents[0]
+      });
+    });
+
+    it('renders links to its entities', function() {
+      drill(subject).find(Link, m.hasText('#add'))
+    });
+  });
+});
diff --git a/packages/megadoc-plugin-js/ui/css/components/doc-entity.less b/packages/megadoc-plugin-js/ui/css/components/doc-entity.less
index b1432b1a..b86e5f8e 100644
--- a/packages/megadoc-plugin-js/ui/css/components/doc-entity.less
+++ b/packages/megadoc-plugin-js/ui/css/components/doc-entity.less
@@ -18,7 +18,7 @@
 
   &__modifier {
     font-size: 0.75em;
-    padding: 0.25em 0.5em;
+    padding: 0.5em;
     margin: 0 0.5em;
   }
 
@@ -37,6 +37,12 @@
     font-family: Monospace, monospace, courier;
   }
 
+  &__method-params, &__function-signature {
+    & + .doc-entity__modifier {
+      margin-left: 1em;
+    }
+  }
+
   &__description.markdown-text p {
     margin: @spacing 0;
   }
@@ -80,6 +86,7 @@
     &__modifier {
       background: @base2;
       color: @base1;
+      text-shadow: 0 1px 0 @base3;
     }
 
     &__protected, &__private {
diff --git a/packages/megadoc-plugin-js/ui/outlets/InspectorOutlet.js b/packages/megadoc-plugin-js/ui/outlets/InspectorOutlet.js
index d9536b7e..572624de 100644
--- a/packages/megadoc-plugin-js/ui/outlets/InspectorOutlet.js
+++ b/packages/megadoc-plugin-js/ui/outlets/InspectorOutlet.js
@@ -29,8 +29,8 @@ megadoc.outlets.add('Inspector', {
       return (
         <div>
           <div className="tooltip__title">
-            {doc.id} ({doc.ctx.type !== K.TYPE_UNKNOWN && (
-              <strong>{doc.ctx.type} </strong>
+            {doc.id} ({doc.type !== K.TYPE_UNKNOWN && (
+              <strong>{doc.type} </strong>
             )}in {namespaceNode.title})
           </div>
 
diff --git a/packages/megadoc-plugin-js/ui/utils/DocClassifier.js b/packages/megadoc-plugin-js/ui/utils/DocClassifier.js
index a30dcee8..2bb50d6c 100644
--- a/packages/megadoc-plugin-js/ui/utils/DocClassifier.js
+++ b/packages/megadoc-plugin-js/ui/utils/DocClassifier.js
@@ -1,9 +1,9 @@
 var K = require('../constants');
 
 function isMethod(doc) {
-  var ctx = doc.ctx;
+  var ctx = doc.nodeInfo;
 
-  return ctx.type === 'function' && (
+  return doc.type === K.TYPE_FUNCTION && (
     ctx.scope === K.SCOPE_FACTORY_EXPORTS ||
     ctx.scope === K.SCOPE_INSTANCE ||
     ctx.scope === K.SCOPE_PROTOTYPE
@@ -11,18 +11,18 @@ function isMethod(doc) {
 }
 
 function isFactoryExports(doc) {
-  return doc.ctx.scope === K.SCOPE_FACTORY_EXPORTS;
+  return doc.nodeInfo.scope === K.SCOPE_FACTORY_EXPORTS;
 }
 
 function isClassEntity(doc) {
   return (
-    doc.ctx.scope === K.SCOPE_INSTANCE ||
-    doc.ctx.scope === K.SCOPE_PROTOTYPE
+    doc.nodeInfo.scope === K.SCOPE_INSTANCE ||
+    doc.nodeInfo.scope === K.SCOPE_PROTOTYPE
   );
 }
 
 function isStaticMethod(doc) {
-  return doc.ctx.type === 'function' && !isMethod(doc);
+  return doc.type === K.TYPE_FUNCTION && !isMethod(doc);
 }
 
 exports.isMethod = isMethod;
@@ -44,7 +44,7 @@ exports.getDisplayType = function(documentNode) {
   else if (documentNode.entities.some(n => isFactoryExports(n.properties))) {
     return 'Factory';
   }
-  else if (documentNode.properties.ctx.type === K.TYPE_FUNCTION) {
+  else if (documentNode.properties.type === K.TYPE_FUNCTION) {
     return 'Function';
   }
   else {
@@ -60,9 +60,17 @@ exports.isStaticProperty = function(doc) {
   return exports.isProperty(doc) && [
     K.SCOPE_PROTOTYPE,
     K.SCOPE_INSTANCE
-  ].indexOf(doc.ctx.scope) === -1;
+  ].indexOf(doc.nodeInfo.scope) === -1;
 };
 
 exports.isMemberProperty = function(doc) {
   return exports.isProperty(doc) && !exports.isStaticProperty(doc);
-};
\ No newline at end of file
+};
+
+exports.isPrivate = function(doc) {
+  return doc && doc.tags.some(x => x.type === 'private');
+};
+
+exports.isProtected = function(doc) {
+  return doc && doc.tags.some(x => x.type === 'protected');
+};
diff --git a/packages/megadoc-plugin-js/ui/utils/__tests__/describeNode.test.js b/packages/megadoc-plugin-js/ui/utils/__tests__/describeNode.test.js
new file mode 100644
index 00000000..85a7ee13
--- /dev/null
+++ b/packages/megadoc-plugin-js/ui/utils/__tests__/describeNode.test.js
@@ -0,0 +1,25 @@
+const Subject = require('../describeNode');
+const K = require('../../constants');
+const { assert } = require('chai');
+
+describe('JS::Utils::describeNode', function() {
+  context('given an Object', function() {
+    const FIXTURE = {
+      type: K.TYPE_OBJECT,
+      properties: [
+        {
+          type: K.TYPE_OBJECT_PROPERTY,
+          key: 'foo',
+          value: {
+            type: K.TYPE_LITERAL,
+            value: 'bar'
+          }
+        }
+      ]
+    };
+
+    it('works', function() {
+      assert.equal(Subject(FIXTURE), JSON.stringify({ foo: 'bar' }, null, 2));
+    });
+  });
+});
\ No newline at end of file
diff --git a/packages/megadoc-plugin-js/ui/utils/describeNode.js b/packages/megadoc-plugin-js/ui/utils/describeNode.js
new file mode 100644
index 00000000..d917e630
--- /dev/null
+++ b/packages/megadoc-plugin-js/ui/utils/describeNode.js
@@ -0,0 +1,35 @@
+const K = require('../constants');
+
+module.exports = function(nodeInfo) {
+  return describeNode(nodeInfo, true);
+};
+
+function describeNode(nodeInfo, stringify) {
+  const print = stringify ? prettyJSON : Identity;
+
+  if (nodeInfo.type === K.TYPE_LITERAL) {
+    return print(nodeInfo.hasOwnProperty('value') ? nodeInfo.value : null);
+  }
+  else if (nodeInfo.type === K.TYPE_ARRAY) {
+    return print(nodeInfo.elements.map(x => describeNode(x, false)));
+  }
+  else if (nodeInfo.type === K.TYPE_OBJECT) {
+    return print(nodeInfo.properties.reduce(function(map, x) {
+      if (x) {
+        map[x.key] = describeNode(x.value, false);
+      }
+
+      return map;
+    }, {}));
+  }
+
+  return null;
+}
+
+function prettyJSON(x) {
+  return JSON.stringify(x, null, 2);
+}
+
+function Identity(x) {
+  return x;
+}
\ No newline at end of file
diff --git a/packages/megadoc-plugin-js/ui/utils/describeType.js b/packages/megadoc-plugin-js/ui/utils/describeType.js
new file mode 100644
index 00000000..d19f11ba
--- /dev/null
+++ b/packages/megadoc-plugin-js/ui/utils/describeType.js
@@ -0,0 +1,34 @@
+const K = require('../constants');
+
+module.exports = function renderType(type) {
+  if (!type) {
+    console.warn("Invalid type!", (new Error()).trace)
+    return '';
+  }
+
+  if (type.name === K.TYPE_UNION) {
+    return type.elements.map(renderType).join('|');
+  }
+  else if (type.name === K.TYPE_ARRAY && type.elements) {
+    return 'Array.&lt;' + type.elements.map(renderType).join('|') + '&gt;';
+  }
+  else if (type.name === K.TYPE_ALL_LITERAL) {
+    return '*';
+  }
+
+  var buffer = type.html || type.name;
+
+  if (type.nullable === false) {
+    buffer += '!';
+  }
+
+  if (type.nullable === true) {
+    buffer += '?';
+  }
+
+  if (type.optional) {
+    buffer += '=';
+  }
+
+  return buffer;
+}
\ No newline at end of file
diff --git a/packages/megadoc-plugin-js/ui/utils/orderAwareSort.js b/packages/megadoc-plugin-js/ui/utils/orderAwareSort.js
index 830d4763..0129d43b 100644
--- a/packages/megadoc-plugin-js/ui/utils/orderAwareSort.js
+++ b/packages/megadoc-plugin-js/ui/utils/orderAwareSort.js
@@ -11,4 +11,17 @@ module.exports = function(doc, array, key) {
   else {
     return sortBy(array, key);
   }
+};
+
+module.exports.asNodes = function(documentNode, array, key) {
+  var preserveOrder = documentNode.properties.tags.some(function(tag) {
+    return tag.type === 'preserveOrder';
+  });
+
+  if (preserveOrder) {
+    return sortBy(array, 'properties.line');
+  }
+  else {
+    return sortBy(array, key);
+  }
 };
\ No newline at end of file
diff --git a/packages/megadoc-plugin-lua/package.json b/packages/megadoc-plugin-lua/package.json
index 55055cc2..66c2d17e 100644
--- a/packages/megadoc-plugin-lua/package.json
+++ b/packages/megadoc-plugin-lua/package.json
@@ -21,11 +21,11 @@
   "homepage": "https://github.com/megadoc/megadoc#readme",
   "dependencies": {
     "luaparse": "0.2.0",
-    "megadoc-docstring": "1.0.x",
     "lodash": "3.10.1"
   },
 
   "peerDependencies": {
-    "megadoc": "5.x"
+    "megadoc": "5.x",
+    "megadoc-docstring": "1.0.x"
   }
 }
diff --git a/packages/megadoc-plugin-react/lib/customTags/LiveExample.js b/packages/megadoc-plugin-react/lib/customTags/LiveExample.js
index bd7f1072..2036dd44 100644
--- a/packages/megadoc-plugin-react/lib/customTags/LiveExample.js
+++ b/packages/megadoc-plugin-react/lib/customTags/LiveExample.js
@@ -24,11 +24,11 @@ module.exports = function createLiveExampleTagProcessor(config) {
   var components = [];
 
   exports.process = function(tag/*, filePath*/) {
-    if (tag.type !== 'example' || tag.typeInfo.types[0] !== 'jsx') {
+    if (tag.type !== 'example' || !tag.typeInfo.type || tag.typeInfo.type.name !== 'jsx') {
       return;
     }
 
-    var lines = tag.string.split('\n');
+    var lines = tag.typeInfo.description.split('\n');
     var sourceCode = lines.filter(function(line) {
       return line.match(/^[ ]{4,}/);
     }).join('\n');
@@ -44,9 +44,12 @@ module.exports = function createLiveExampleTagProcessor(config) {
     else {
       tag.alignment = 'left';
     }
-
     var elementInfo = parseNameAndProps(sourceCode);
 
+    if (!elementInfo) {
+      return false;
+    }
+
     tag.sourceCode = sourceCode;
     tag.elementName = elementInfo.name;
     tag.elementProps = elementInfo.props;
diff --git a/packages/megadoc-plugin-react/lib/customTags/LiveExample/parseNameAndProps.js b/packages/megadoc-plugin-react/lib/customTags/LiveExample/parseNameAndProps.js
index ed1fdfc1..1930e6e1 100644
--- a/packages/megadoc-plugin-react/lib/customTags/LiveExample/parseNameAndProps.js
+++ b/packages/megadoc-plugin-react/lib/customTags/LiveExample/parseNameAndProps.js
@@ -7,9 +7,17 @@ module.exports = function(srcCode) {
     comments: false,
     code: false,
     ast: true,
+    babelrc: false,
     presets: [ 'react' ]
   });
 
+  if (!compiled.ast || !compiled.ast.program.body[0]) {
+    console.warn("Unable to parse Live Example code");
+    console.warn("Source code:\n", srcCode);
+
+    return null;
+  }
+
   // args are what's passed to React.createElement():
   //
   // 1. {string} name
diff --git a/packages/megadoc-plugin-react/lib/nodeAnalyzer/__tests__/index.test.js b/packages/megadoc-plugin-react/lib/nodeAnalyzer/__tests__/index.test.js
index b88b88b9..bf94465e 100644
--- a/packages/megadoc-plugin-react/lib/nodeAnalyzer/__tests__/index.test.js
+++ b/packages/megadoc-plugin-react/lib/nodeAnalyzer/__tests__/index.test.js
@@ -10,12 +10,12 @@ describe('analyzeReactNode', function() {
     });
 
     assert.equal(docs.length, 1);
-    assert.equal(docs[0].ctx.type, 'component');
+    assert.equal(docs[0].type, 'component');
   });
 
   it('should mark a component with a displayName', function() {
     var docs = TestUtils.parse(function() {;
-      // /** @module Some component. */
+      // /** @module */
       //  module.exports = React.createClass({
       //    displayName: "SomeComponent"
       //  });
@@ -23,6 +23,6 @@ describe('analyzeReactNode', function() {
 
     assert.equal(docs.length, 1);
     assert.equal(docs[0].id, 'SomeComponent');
-    assert.equal(docs[0].ctx.type, 'component');
+    assert.equal(docs[0].type, 'component');
   });
 });
diff --git a/packages/megadoc-plugin-react/lib/nodeAnalyzer/__tests__/parsePropTypes.test.js b/packages/megadoc-plugin-react/lib/nodeAnalyzer/__tests__/parsePropTypes.test.js
index 0a525c0a..d4da0561 100644
--- a/packages/megadoc-plugin-react/lib/nodeAnalyzer/__tests__/parsePropTypes.test.js
+++ b/packages/megadoc-plugin-react/lib/nodeAnalyzer/__tests__/parsePropTypes.test.js
@@ -14,9 +14,9 @@ describe('analyzeReactNode - propTypes', function() {
       });
 
       assert.equal(docs.length, 1);
-      assert.equal(docs[0].ctx.propTypes.length, 1);
-      assert.equal(docs[0].ctx.propTypes[0].name, 'name');
-      assert.equal(docs[0].ctx.propTypes[0].type, 'string');
+      assert.equal(docs[0].nodeInfo.propTypes.length, 1);
+      assert.equal(docs[0].nodeInfo.propTypes[0].name, 'name');
+      assert.equal(docs[0].nodeInfo.propTypes[0].type, 'string');
     });
 
     it('works with "name: React.PropTypes.string.isRequired"', function() {
@@ -30,10 +30,10 @@ describe('analyzeReactNode - propTypes', function() {
       });
 
       assert.equal(docs.length, 1);
-      assert.equal(docs[0].ctx.propTypes.length, 1);
-      assert.equal(docs[0].ctx.propTypes[0].name, 'name');
-      assert.equal(docs[0].ctx.propTypes[0].type, 'string');
-      assert.equal(docs[0].ctx.propTypes[0].isRequired, true);
+      assert.equal(docs[0].nodeInfo.propTypes.length, 1);
+      assert.equal(docs[0].nodeInfo.propTypes[0].name, 'name');
+      assert.equal(docs[0].nodeInfo.propTypes[0].type, 'string');
+      assert.equal(docs[0].nodeInfo.propTypes[0].isRequired, true);
     });
 
     it('works with "name: string"', function() {
@@ -47,9 +47,9 @@ describe('analyzeReactNode - propTypes', function() {
       });
 
       assert.equal(docs.length, 1);
-      assert.equal(docs[0].ctx.propTypes.length, 1);
-      assert.equal(docs[0].ctx.propTypes[0].name, 'name');
-      assert.equal(docs[0].ctx.propTypes[0].type, 'string');
+      assert.equal(docs[0].nodeInfo.propTypes.length, 1);
+      assert.equal(docs[0].nodeInfo.propTypes[0].name, 'name');
+      assert.equal(docs[0].nodeInfo.propTypes[0].type, 'string');
     });
 
     it('works with "name: string.isRequired"', function() {
@@ -63,9 +63,9 @@ describe('analyzeReactNode - propTypes', function() {
       });
 
       assert.equal(docs.length, 1);
-      assert.equal(docs[0].ctx.propTypes.length, 1);
-      assert.equal(docs[0].ctx.propTypes[0].name, 'name');
-      assert.equal(docs[0].ctx.propTypes[0].type, 'string');
+      assert.equal(docs[0].nodeInfo.propTypes.length, 1);
+      assert.equal(docs[0].nodeInfo.propTypes[0].name, 'name');
+      assert.equal(docs[0].nodeInfo.propTypes[0].type, 'string');
     });
   });
 
@@ -81,9 +81,9 @@ describe('analyzeReactNode - propTypes', function() {
       });
 
       assert.equal(docs.length, 1);
-      assert.equal(docs[0].ctx.propTypes.length, 1);
-      assert.equal(docs[0].ctx.propTypes[0].name, 'someProp');
-      assert.equal(docs[0].ctx.propTypes[0].type, 'custom');
+      assert.equal(docs[0].nodeInfo.propTypes.length, 1);
+      assert.equal(docs[0].nodeInfo.propTypes[0].name, 'someProp');
+      assert.equal(docs[0].nodeInfo.propTypes[0].type, 'custom');
     });
 
     it('works with "name: () => {}"', function() {
@@ -97,9 +97,9 @@ describe('analyzeReactNode - propTypes', function() {
       });
 
       assert.equal(docs.length, 1);
-      assert.equal(docs[0].ctx.propTypes.length, 1);
-      assert.equal(docs[0].ctx.propTypes[0].name, 'someProp');
-      assert.equal(docs[0].ctx.propTypes[0].type, 'custom');
+      assert.equal(docs[0].nodeInfo.propTypes.length, 1);
+      assert.equal(docs[0].nodeInfo.propTypes[0].name, 'someProp');
+      assert.equal(docs[0].nodeInfo.propTypes[0].type, 'custom');
     });
 
     it('works with "name: function someNamedValidator() {}"', function() {
@@ -113,9 +113,9 @@ describe('analyzeReactNode - propTypes', function() {
       });
 
       assert.equal(docs.length, 1);
-      assert.equal(docs[0].ctx.propTypes.length, 1);
-      assert.equal(docs[0].ctx.propTypes[0].name, 'name');
-      assert.equal(docs[0].ctx.propTypes[0].type, 'someNamedValidator');
+      assert.equal(docs[0].nodeInfo.propTypes.length, 1);
+      assert.equal(docs[0].nodeInfo.propTypes[0].name, 'name');
+      assert.equal(docs[0].nodeInfo.propTypes[0].type, 'someNamedValidator');
     });
   });
 
@@ -134,10 +134,10 @@ describe('analyzeReactNode - propTypes', function() {
       });
 
       assert.equal(docs.length, 1);
-      assert.equal(docs[0].ctx.propTypes.length, 1);
-      assert.equal(docs[0].ctx.propTypes[0].name, 'name');
-      assert.equal(docs[0].ctx.propTypes[0].type, 'oneOfType');
-      assert.deepEqual(docs[0].ctx.propTypes[0].types, [
+      assert.equal(docs[0].nodeInfo.propTypes.length, 1);
+      assert.equal(docs[0].nodeInfo.propTypes[0].name, 'name');
+      assert.equal(docs[0].nodeInfo.propTypes[0].type, 'oneOfType');
+      assert.deepEqual(docs[0].nodeInfo.propTypes[0].types, [
         { type: 'number' },
         { type: 'string' },
       ]);
@@ -157,11 +157,11 @@ describe('analyzeReactNode - propTypes', function() {
       });
 
       assert.equal(docs.length, 1);
-      assert.equal(docs[0].ctx.propTypes.length, 1);
-      assert.equal(docs[0].ctx.propTypes[0].name, 'name');
-      assert.equal(docs[0].ctx.propTypes[0].type, 'oneOfType');
-      assert.equal(docs[0].ctx.propTypes[0].isRequired, true);
-      assert.deepEqual(docs[0].ctx.propTypes[0].types, [
+      assert.equal(docs[0].nodeInfo.propTypes.length, 1);
+      assert.equal(docs[0].nodeInfo.propTypes[0].name, 'name');
+      assert.equal(docs[0].nodeInfo.propTypes[0].type, 'oneOfType');
+      assert.equal(docs[0].nodeInfo.propTypes[0].isRequired, true);
+      assert.deepEqual(docs[0].nodeInfo.propTypes[0].types, [
         { type: 'number' },
         { type: 'string' },
       ]);
@@ -183,11 +183,11 @@ describe('analyzeReactNode - propTypes', function() {
       });
 
       assert.equal(docs.length, 1);
-      assert.equal(docs[0].ctx.propTypes.length, 1);
-      assert.equal(docs[0].ctx.propTypes[0].name, 'name');
-      assert.equal(docs[0].ctx.propTypes[0].type, 'oneOf');
-      assert.equal(docs[0].ctx.propTypes[0].values[0].value, 'a');
-      assert.equal(docs[0].ctx.propTypes[0].values[1].value, 1);
+      assert.equal(docs[0].nodeInfo.propTypes.length, 1);
+      assert.equal(docs[0].nodeInfo.propTypes[0].name, 'name');
+      assert.equal(docs[0].nodeInfo.propTypes[0].type, 'oneOf');
+      assert.equal(docs[0].nodeInfo.propTypes[0].values[0].value, 'a');
+      assert.equal(docs[0].nodeInfo.propTypes[0].values[1].value, 1);
     });
 
     it('works with "oneOf([ "a", 1 ]).isRequired"', function() {
@@ -201,10 +201,10 @@ describe('analyzeReactNode - propTypes', function() {
       });
 
       assert.equal(docs.length, 1);
-      assert.equal(docs[0].ctx.propTypes.length, 1);
-      assert.equal(docs[0].ctx.propTypes[0].name, 'name');
-      assert.equal(docs[0].ctx.propTypes[0].type, 'oneOf');
-      assert.equal(docs[0].ctx.propTypes[0].isRequired, true);
+      assert.equal(docs[0].nodeInfo.propTypes.length, 1);
+      assert.equal(docs[0].nodeInfo.propTypes[0].name, 'name');
+      assert.equal(docs[0].nodeInfo.propTypes[0].type, 'oneOf');
+      assert.equal(docs[0].nodeInfo.propTypes[0].isRequired, true);
     });
   });
 
@@ -223,14 +223,14 @@ describe('analyzeReactNode - propTypes', function() {
       });
 
       assert.equal(docs.length, 1);
-      assert.equal(docs[0].ctx.propTypes.length, 1);
-      assert.equal(docs[0].ctx.propTypes[0].name, 'object');
-      assert.equal(docs[0].ctx.propTypes[0].type, 'shape');
-      assert.equal(docs[0].ctx.propTypes[0].properties.length, 2);
-      assert.equal(docs[0].ctx.propTypes[0].properties[0].name, 'name');
-      assert.equal(docs[0].ctx.propTypes[0].properties[0].type, 'string');
-      assert.equal(docs[0].ctx.propTypes[0].properties[1].name, 'age');
-      assert.equal(docs[0].ctx.propTypes[0].properties[1].type, 'number');
+      assert.equal(docs[0].nodeInfo.propTypes.length, 1);
+      assert.equal(docs[0].nodeInfo.propTypes[0].name, 'object');
+      assert.equal(docs[0].nodeInfo.propTypes[0].type, 'shape');
+      assert.equal(docs[0].nodeInfo.propTypes[0].properties.length, 2);
+      assert.equal(docs[0].nodeInfo.propTypes[0].properties[0].name, 'name');
+      assert.equal(docs[0].nodeInfo.propTypes[0].properties[0].type, 'string');
+      assert.equal(docs[0].nodeInfo.propTypes[0].properties[1].name, 'age');
+      assert.equal(docs[0].nodeInfo.propTypes[0].properties[1].type, 'number');
     });
 
     it('works with nested shapes', function() {
@@ -250,19 +250,19 @@ describe('analyzeReactNode - propTypes', function() {
       });
 
       assert.equal(docs.length, 1);
-      assert.equal(docs[0].ctx.propTypes.length, 1);
-      assert.equal(docs[0].ctx.propTypes[0].name, 'person');
-      assert.equal(docs[0].ctx.propTypes[0].type, 'shape');
-      assert.equal(docs[0].ctx.propTypes[0].properties.length, 2);
-      assert.equal(docs[0].ctx.propTypes[0].properties[0].name, 'name');
-      assert.equal(docs[0].ctx.propTypes[0].properties[0].type, 'string');
-      assert.equal(docs[0].ctx.propTypes[0].properties[1].name, 'locale');
-      assert.equal(docs[0].ctx.propTypes[0].properties[1].type, 'shape');
-      assert.equal(docs[0].ctx.propTypes[0].properties[1].properties.length, 2);
-      assert.equal(docs[0].ctx.propTypes[0].properties[1].properties[0].name, 'country');
-      assert.equal(docs[0].ctx.propTypes[0].properties[1].properties[0].type, 'string');
-      assert.equal(docs[0].ctx.propTypes[0].properties[1].properties[1].name, 'isoCode');
-      assert.equal(docs[0].ctx.propTypes[0].properties[1].properties[1].type, 'string');
+      assert.equal(docs[0].nodeInfo.propTypes.length, 1);
+      assert.equal(docs[0].nodeInfo.propTypes[0].name, 'person');
+      assert.equal(docs[0].nodeInfo.propTypes[0].type, 'shape');
+      assert.equal(docs[0].nodeInfo.propTypes[0].properties.length, 2);
+      assert.equal(docs[0].nodeInfo.propTypes[0].properties[0].name, 'name');
+      assert.equal(docs[0].nodeInfo.propTypes[0].properties[0].type, 'string');
+      assert.equal(docs[0].nodeInfo.propTypes[0].properties[1].name, 'locale');
+      assert.equal(docs[0].nodeInfo.propTypes[0].properties[1].type, 'shape');
+      assert.equal(docs[0].nodeInfo.propTypes[0].properties[1].properties.length, 2);
+      assert.equal(docs[0].nodeInfo.propTypes[0].properties[1].properties[0].name, 'country');
+      assert.equal(docs[0].nodeInfo.propTypes[0].properties[1].properties[0].type, 'string');
+      assert.equal(docs[0].nodeInfo.propTypes[0].properties[1].properties[1].name, 'isoCode');
+      assert.equal(docs[0].nodeInfo.propTypes[0].properties[1].properties[1].type, 'string');
     });
   });
 
@@ -278,11 +278,11 @@ describe('analyzeReactNode - propTypes', function() {
       });
 
       assert.equal(docs.length, 1);
-      assert.equal(docs[0].ctx.propTypes.length, 1);
-      assert.equal(docs[0].ctx.propTypes[0].name, 'name');
-      assert.equal(docs[0].ctx.propTypes[0].type, 'arrayOf');
-      assert.equal(docs[0].ctx.propTypes[0].types.length, 1);
-      assert.equal(docs[0].ctx.propTypes[0].types[0].type, 'string');
+      assert.equal(docs[0].nodeInfo.propTypes.length, 1);
+      assert.equal(docs[0].nodeInfo.propTypes[0].name, 'name');
+      assert.equal(docs[0].nodeInfo.propTypes[0].type, 'arrayOf');
+      assert.equal(docs[0].nodeInfo.propTypes[0].types.length, 1);
+      assert.equal(docs[0].nodeInfo.propTypes[0].types[0].type, 'string');
     });
 
     it('works with "arrayOf(string).isRequired"', function() {
@@ -296,10 +296,10 @@ describe('analyzeReactNode - propTypes', function() {
       });
 
       assert.equal(docs.length, 1);
-      assert.equal(docs[0].ctx.propTypes.length, 1);
-      assert.equal(docs[0].ctx.propTypes[0].name, 'name');
-      assert.equal(docs[0].ctx.propTypes[0].type, 'arrayOf');
-      assert.equal(docs[0].ctx.propTypes[0].isRequired, true);
+      assert.equal(docs[0].nodeInfo.propTypes.length, 1);
+      assert.equal(docs[0].nodeInfo.propTypes[0].name, 'name');
+      assert.equal(docs[0].nodeInfo.propTypes[0].type, 'arrayOf');
+      assert.equal(docs[0].nodeInfo.propTypes[0].isRequired, true);
     });
   });
 
@@ -315,10 +315,10 @@ describe('analyzeReactNode - propTypes', function() {
       });
 
       assert.equal(docs.length, 1);
-      assert.equal(docs[0].ctx.propTypes.length, 1);
-      assert.equal(docs[0].ctx.propTypes[0].name, 'name');
-      assert.equal(docs[0].ctx.propTypes[0].type, 'instanceOf');
-      assert.equal(docs[0].ctx.propTypes[0].target.type, 'Date');
+      assert.equal(docs[0].nodeInfo.propTypes.length, 1);
+      assert.equal(docs[0].nodeInfo.propTypes[0].name, 'name');
+      assert.equal(docs[0].nodeInfo.propTypes[0].type, 'instanceOf');
+      assert.equal(docs[0].nodeInfo.propTypes[0].target.type, 'Date');
     });
 
     it('works with "instanceOf(Date).isRequired"', function() {
@@ -332,10 +332,10 @@ describe('analyzeReactNode - propTypes', function() {
       });
 
       assert.equal(docs.length, 1);
-      assert.equal(docs[0].ctx.propTypes.length, 1);
-      assert.equal(docs[0].ctx.propTypes[0].name, 'name');
-      assert.equal(docs[0].ctx.propTypes[0].type, 'instanceOf');
-      assert.equal(docs[0].ctx.propTypes[0].isRequired, true);
+      assert.equal(docs[0].nodeInfo.propTypes.length, 1);
+      assert.equal(docs[0].nodeInfo.propTypes[0].name, 'name');
+      assert.equal(docs[0].nodeInfo.propTypes[0].type, 'instanceOf');
+      assert.equal(docs[0].nodeInfo.propTypes[0].isRequired, true);
     });
   });
 
diff --git a/packages/megadoc-plugin-react/lib/postProcessors/__tests__/correctifyFunctionScopes.test.js b/packages/megadoc-plugin-react/lib/postProcessors/__tests__/correctifyFunctionScopes.test.js
index 75cdace0..f11b62ca 100644
--- a/packages/megadoc-plugin-react/lib/postProcessors/__tests__/correctifyFunctionScopes.test.js
+++ b/packages/megadoc-plugin-react/lib/postProcessors/__tests__/correctifyFunctionScopes.test.js
@@ -6,7 +6,7 @@ var findWhere = require('lodash').findWhere;
 describe('analyzeReactNode - statics', function() {
   it('should find and track a static property', function() {
     var docs = TestUtils.parse(function() {;
-      // /** @module Some component. */
+      // /** @module */
       //  var Something = React.createClass({
       //    statics: {
       //      someFunction: function() {}
@@ -16,13 +16,13 @@ describe('analyzeReactNode - statics', function() {
 
     assert.equal(docs.length, 1);
 
-    assert.equal(docs[0].ctx.statics.length, 1);
-    assert.equal(docs[0].ctx.statics[0], 'someFunction');
+    assert.equal(docs[0].nodeInfo.statics.length, 1);
+    assert.equal(docs[0].nodeInfo.statics[0], 'someFunction');
   });
 
   it('should correctify the scope of documented static methods', function() {
     var docs = TestUtils.parse(function() {;
-      // /** @module Some component. */
+      // /** @module */
       //  var Something = React.createClass({
       //    statics: {
       //      /** Foo */
@@ -35,8 +35,8 @@ describe('analyzeReactNode - statics', function() {
 
     var doc = findWhere(docs, { name: 'someFunction' });
 
-    assert.equal(doc.ctx.scope, K.SCOPE_UNDEFINED);
-    assert.equal(doc.ctx.symbol, '.');
+    assert.equal(doc.nodeInfo.scope, K.SCOPE_UNDEFINED);
+    assert.equal(doc.symbol, '.');
     assert.equal(doc.id, 'Something.someFunction');
   });
 });
@@ -44,7 +44,7 @@ describe('analyzeReactNode - statics', function() {
 describe('analyzeReactNode - methods', function() {
   it('should correctify the scope of an instance method', function() {
     var docs = TestUtils.parse(function() {;
-      // /** @module Some component. */
+      // /** @module */
       //  var Something = React.createClass({
       //    /** Do something. */
       //    someMethod() {
@@ -56,8 +56,8 @@ describe('analyzeReactNode - methods', function() {
 
     var doc = findWhere(docs, { name: 'someMethod' });
 
-    assert.equal(doc.ctx.type, 'function');
-    assert.equal(doc.ctx.scope, K.SCOPE_INSTANCE);
+    assert.equal(doc.type, K.TYPE_FUNCTION);
+    assert.equal(doc.nodeInfo.scope, K.SCOPE_INSTANCE);
     assert.equal(doc.id, 'Something#someMethod');
   });
 });
diff --git a/packages/megadoc-plugin-react/lib/postProcessors/correctifyFunctionScopes.js b/packages/megadoc-plugin-react/lib/postProcessors/correctifyFunctionScopes.js
index ec165eb9..f72b094a 100644
--- a/packages/megadoc-plugin-react/lib/postProcessors/correctifyFunctionScopes.js
+++ b/packages/megadoc-plugin-react/lib/postProcessors/correctifyFunctionScopes.js
@@ -4,20 +4,20 @@ var K = require('megadoc-plugin-js/lib/Parser/constants');
 module.exports = function(database) {
   database
     .filter(function(doc) {
-      return doc.isModule && doc.ctx.type === 'component';
+      return doc.isModule && doc.type === 'component';
     })
     .forEach(function(doc) {
       where(database, { receiver: doc.id }).forEach(function(entityDoc) {
-        if (entityDoc.ctx.type === K.TYPE_FUNCTION) {
-          if (doc.ctx.statics.indexOf(entityDoc.name) > -1) {
+        if (entityDoc.type === K.TYPE_FUNCTION) {
+          if (doc.nodeInfo.statics.indexOf(entityDoc.name) > -1) {
             entityDoc.id = [ doc.id, entityDoc.name ].join('.');
-            entityDoc.ctx.scope = K.SCOPE_UNSCOPED;
-            entityDoc.ctx.symbol = '.';
+            entityDoc.nodeInfo.scope = K.SCOPE_UNSCOPED;
+            entityDoc.symbol = '.';
           }
           else {
             entityDoc.id = [ doc.id, entityDoc.name ].join('#');
-            entityDoc.ctx.symbol = '#';
-            entityDoc.ctx.scope = K.SCOPE_INSTANCE;
+            entityDoc.symbol = '#';
+            entityDoc.nodeInfo.scope = K.SCOPE_INSTANCE;
           }
         }
       });
diff --git a/packages/megadoc-plugin-react/lib/postProcessors/trackComponentsWithoutLiveExamples.js b/packages/megadoc-plugin-react/lib/postProcessors/trackComponentsWithoutLiveExamples.js
index 1cffaa0a..d0e5a51d 100644
--- a/packages/megadoc-plugin-react/lib/postProcessors/trackComponentsWithoutLiveExamples.js
+++ b/packages/megadoc-plugin-react/lib/postProcessors/trackComponentsWithoutLiveExamples.js
@@ -1,7 +1,7 @@
 module.exports = function(database, track) {
   database
     .filter(function(doc) {
-      return doc.isModule && doc.ctx.type === 'component';
+      return doc.isModule && doc.type === 'component';
     })
     .forEach(function(doc) {
       track(doc.absoluteFilePath, doc.name);
diff --git a/packages/megadoc-plugin-react/package.json b/packages/megadoc-plugin-react/package.json
index 293e8660..d35c8b68 100644
--- a/packages/megadoc-plugin-react/package.json
+++ b/packages/megadoc-plugin-react/package.json
@@ -19,19 +19,12 @@
   },
   "homepage": "https://github.com/megadoc/megadoc#readme",
   "dependencies": {
-    "babel-core": "6.7.6",
-    "babel-generator": "6.7.5",
-    "babel-preset-react": "6.5.0",
-    "babel-types": "6.7.2",
+    "babel-generator": "6.9.0",
+    "babel-types": "6.9.0",
     "lodash": "3.10.1"
   },
   "peerDependencies": {
     "megadoc": "5.x",
     "megadoc-plugin-js": "5.x"
-  },
-  "devDependencies": {
-    "babel-loader": "6.2.4",
-    "react": "^0.14.0",
-    "webpack": "1.13.0"
   }
 }
diff --git a/packages/megadoc-theme-qt/ui/css/qt--multi-page-layout.less b/packages/megadoc-theme-qt/ui/css/qt--multi-page-layout.less
index c132db05..aa35243a 100644
--- a/packages/megadoc-theme-qt/ui/css/qt--multi-page-layout.less
+++ b/packages/megadoc-theme-qt/ui/css/qt--multi-page-layout.less
@@ -52,7 +52,7 @@
     font-weight: normal;
   }
 
-  .banner__navigation-item a.active {
+  .banner__navigation-item a.active, .banner__menu-list-item a.active {
     border-bottom-width: 0;
   }
 }
diff --git a/packages/megadoc-theme-qt/ui/index.js b/packages/megadoc-theme-qt/ui/index.js
index b83c7eac..93b5ed3e 100644
--- a/packages/megadoc-theme-qt/ui/index.js
+++ b/packages/megadoc-theme-qt/ui/index.js
@@ -1,7 +1,8 @@
-const TwoColumnLayout = require('components/TwoColumnLayout');
+const AppState = require('core/AppState');
+const config = require('config');
 
-megadoc.use('megadoc-theme-qt', function ThemeQt(api, configs) {
-  if (configs.some(x => x.invertedSidebar)) {
-    TwoColumnLayout.invert();
+megadoc.use('megadoc-theme-qt', function ThemeQt() {
+  if (config.pluginConfigs['megadoc-theme-qt'].some(x => x.invertedSidebar)) {
+    AppState.invertTwoColumnLayout();
   }
 });
\ No newline at end of file
diff --git a/packages/megadoc-theme-qt/ui/index.less b/packages/megadoc-theme-qt/ui/index.less
index 98737996..9974aa07 100644
--- a/packages/megadoc-theme-qt/ui/index.less
+++ b/packages/megadoc-theme-qt/ui/index.less
@@ -22,9 +22,9 @@ a, a.active {
   font-weight: normal;
 }
 
-pre {
-  font-size: 0.9rem;
-}
+// pre {
+//   font-size: 0.9rem;
+// }
 
 .schemable({
   background: @background;
diff --git a/ui/css/components/banner.less b/ui/css/components/banner.less
index 5fe1df2e..361cb428 100644
--- a/ui/css/components/banner.less
+++ b/ui/css/components/banner.less
@@ -48,6 +48,8 @@
     padding: 0;
     left: 0;
     min-width: 100%;
+    border-bottom-width: 3px;
+    border-bottom-style: solid;
   }
 
   &__menu-list-item a {
@@ -56,6 +58,8 @@
     line-height: 3em;
     text-align: left;
     white-space: nowrap;
+    border-left-width: 3px;
+    border-left-style: solid;
   }
 }
 
@@ -116,7 +120,7 @@
 
     &.active {
       color: @accent;
-      border-bottom: 3px solid @accent;
+      border-bottom-color: @accent;
     }
   }
 
@@ -136,13 +140,13 @@
 
   .banner__menu-list {
     background: @base3;
-    border-bottom: 3px solid @base2;
+    border-bottom-color: @base2;
     margin-top: 0;
     margin-left: -3px;
   }
 
   .banner__menu-list-item a {
-    border-left: 3px solid @base2;
+    border-left-color: @base2;
   }
 
   .banner__menu-list-item a:hover,
diff --git a/ui/css/index.less b/ui/css/index.less
index 67c6bf6d..2bd418dd 100644
--- a/ui/css/index.less
+++ b/ui/css/index.less
@@ -87,6 +87,13 @@ ul, ol {
   float: left;
 }
 
+blockquote {
+  border-left-width: 0.5em;
+  border-left-style: solid;
+  padding-left: 1em;
+  margin: 1.5em 0;
+}
+
 .schemable({
   background-color: @base3;
   color: @base0;
@@ -135,14 +142,12 @@ ul, ol {
   }
 
   blockquote {
-    border-left: 0.5em solid @border-color;
-    padding-left: 1em;
+    border-left-color: @border-color;
     color: @base1;
-    margin: 1.5em 0;
-  }
 
-  blockquote.warning {
-    border-color: @solarized-orange;
+    &.warning, &.blockquote--warning {
+      border-color: @solarized-red;
+    }
   }
 });
 
diff --git a/ui/screens/Root.js b/ui/screens/Root.js
index d1319612..489a556e 100644
--- a/ui/screens/Root.js
+++ b/ui/screens/Root.js
@@ -145,7 +145,15 @@ const Root = React.createClass({
 module.exports = Root;
 
 function isInternalLink(node) {
-  const href = node.getAttribute('href');
+  const href = node.href;
 
-  return href && href.indexOf(location.origin) === 0;
+  if (href && typeof href === 'object') {
+    // SVG
+    if (node.className.baseVal.indexOf('mega-link--internal') > -1) {
+      return href.baseVal;
+    }
+  }
+  else {
+    return href && href.indexOf(location.origin) === 0;
+  }
 }
\ No newline at end of file
diff --git a/ui/shared/components/TwoColumnLayout.js b/ui/shared/components/TwoColumnLayout.js
index 5bb8f293..150708e5 100644
--- a/ui/shared/components/TwoColumnLayout.js
+++ b/ui/shared/components/TwoColumnLayout.js
@@ -1,7 +1,7 @@
 const React = require('react');
 const { findDOMNode } = require('react-dom');
 const findChildByType = require('utils/findChildByType');
-const EventEmitter = require('core/EventEmitter');
+const AppState = require('core/AppState');
 const Storage = require('core/Storage');
 const resizable = require('utils/resizable');
 const classSet = require('utils/classSet');
@@ -16,10 +16,6 @@ const {
 
 Storage.register(CFG_SIDEBAR_WIDTH, INITIAL_SIDEBAR_WIDTH);
 
-// We want all instances of TwoColumnLayout across the app to share the same
-// sidebar width, so we'll track it here outside of state or something.
-let inverted;
-
 const LeftColumn = React.createClass({
   propTypes: {
     children: React.PropTypes.any,
@@ -41,10 +37,6 @@ const RightColumn = React.createClass({
 });
 
 const TwoColumnLayout = React.createClass({
-  statics: {
-    invert() { inverted = true; }
-  },
-
   propTypes: {
     children: React.PropTypes.any,
   },
@@ -58,6 +50,8 @@ const TwoColumnLayout = React.createClass({
   },
 
   componentDidMount() {
+    AppState.on('change', this.reload);
+
     // so that we reset the sidebar width if storage was cleared
     // Storage.on('change', () => {
     //   this.setState({
@@ -74,6 +68,8 @@ const TwoColumnLayout = React.createClass({
   },
 
   componentWillUnmount() {
+    AppState.off('change', this.reload);
+
     if (config.resizableSidebar) {
       this.resizableInstance.destroy();
     }
@@ -89,8 +85,15 @@ const TwoColumnLayout = React.createClass({
       'two-column-layout__left--collapsed': this.state.sidebarCollapsed
     });
 
+    const inverted = AppState.isTwoColumnLayoutInverted();
+
     return (
-      <div className={classSet({ "two-column-layout": true, "two-column-layout--inverted": inverted })}>
+      <div
+        className={classSet({
+          "two-column-layout": true,
+          "two-column-layout--inverted": inverted
+        })}
+      >
         <div
           className={leftClassName}
           style={{ width: sidebarWidth }}
@@ -126,7 +129,7 @@ const TwoColumnLayout = React.createClass({
     );
   },
 
-  reloadOnResize() {
+  reload() {
     this.forceUpdate();
   },
 
diff --git a/ui/shared/core/AppState.js b/ui/shared/core/AppState.js
index 0159edf6..f6808e2f 100644
--- a/ui/shared/core/AppState.js
+++ b/ui/shared/core/AppState.js
@@ -6,6 +6,7 @@ const invariant = require('utils/invariant');
 let state = {
   layout: config.layout,
   spotlightOpen: false,
+  invertedTCL: false,
   singlePageMode: config.layoutOptions && config.layoutOptions.singlePageMode,
 };
 
@@ -48,4 +49,22 @@ AppState.inSinglePageMode = function() {
   return state.singlePageMode;
 };
 
+AppState.invertTwoColumnLayout = function() {
+  if (!AppState.isTwoColumnLayoutInverted()) {
+    state.invertedTCL = true;
+    AppState.emit('change');
+  }
+};
+
+AppState.restoreTwoColumnLayout = function() {
+  if (AppState.isTwoColumnLayoutInverted()) {
+    state.invertedTCL = false;
+    AppState.emit('change');
+  }
+};
+
+AppState.isTwoColumnLayoutInverted = function() {
+  return state.invertedTCL;
+};
+
 module.exports = AppState;
diff --git a/ui/shared/core/CorpusAPI.js b/ui/shared/core/CorpusAPI.js
index 0eb39c99..e7647d48 100644
--- a/ui/shared/core/CorpusAPI.js
+++ b/ui/shared/core/CorpusAPI.js
@@ -82,12 +82,14 @@ function CorpusAPI(shallowCorpus) {
     value: length
   });
 
+  exports.getNamespaceOfDocument = getNamespaceOfDocument;
+
   /**
+   * @memberOf CorpusAPI
+   *
    * @param  {String} uid
    * @return {T.Namespace}
    */
-  exports.getNamespaceOfDocument = getNamespaceOfDocument;
-
   function getNamespaceOfDocument(uid) {
     let node = typeof uid === 'string' ? getByUID(uid) : uid;
 
diff --git a/ui/shared/core/Router.js b/ui/shared/core/Router.js
index 3b0e586c..7c10f303 100644
--- a/ui/shared/core/Router.js
+++ b/ui/shared/core/Router.js
@@ -90,6 +90,16 @@ Router.refreshScroll = function() {
   }
 };
 
+/**
+ * @deprecated
+ *
+ * Hello.
+ *
+ * @param  {String} options.routeName [description]
+ * @param  {Object} options.params    [description]
+ *
+ * @return {String}                   [description]
+ */
 Router.generateAnchorId = function({ routeName, params }) {
   invariant(false, "Routing is disabled!");
 
diff --git a/ui/shared/test_helpers/reactSuite/API.js b/ui/shared/test_helpers/reactSuite/API.js
index 84c9c353..626ff347 100644
--- a/ui/shared/test_helpers/reactSuite/API.js
+++ b/ui/shared/test_helpers/reactSuite/API.js
@@ -44,7 +44,7 @@ ReactSuiteAPI.getDOMContainer = function() {
  */
 ReactSuiteAPI.prototype.createSubject = function(initialProps, done) {
   const Type = this.type;
-  const props = initialProps instanceof Function ?
+  const props = this.initialProps = initialProps instanceof Function ?
     initialProps() :
     initialProps
   ;
@@ -65,7 +65,7 @@ ReactSuiteAPI.prototype.createSubject = function(initialProps, done) {
 };
 
 ReactSuiteAPI.prototype.setProps = function(props) {
-  this.subject = render(<this.type {...props} />, this.container);
+  this.subject = render(<this.type {...this.initialProps} {...props} />, this.container);
 };
 
 /**