diff --git a/framework/inspector/dom-agent.sky b/framework/inspector/dom-agent.sky
index 6e6048fda61..f3bc58ee03c 100644
--- a/framework/inspector/dom-agent.sky
+++ b/framework/inspector/dom-agent.sky
@@ -60,10 +60,6 @@ DOMAgent.prototype.serializeNode_ = function(node) {
     if (!nodeValue.trim())
       return null;
     record.nodeValue = nodeValue;
-  } else if (node instanceof Comment) {
-    record.nodeType = 8;
-    record.nodeName = "#comment";
-    record.nodeValue = node.data;
   } else if (node instanceof Document) {
     isContainer = true;
     record.nodeType = 9;
diff --git a/tools/sky_server b/tools/sky_server
index c826d56736f..ae38fccc57c 100755
--- a/tools/sky_server
+++ b/tools/sky_server
@@ -7,10 +7,14 @@ import argparse
 import os
 import cherrypy
 
+
 BUILD_DIRECTORY = 'out'
 CONFIG_DIRECTORY = 'Debug'
-GEN_DIRECTORY = os.path.abspath(os.path.join(__file__, os.pardir, os.pardir,
-    os.pardir, BUILD_DIRECTORY, CONFIG_DIRECTORY, 'gen'))
+SRC_ROOT = os.path.abspath(os.path.join(__file__, os.pardir, os.pardir,
+    os.pardir))
+SKY_ROOT = os.path.join(SRC_ROOT, 'sky')
+GEN_ROOT = os.path.join(SRC_ROOT, BUILD_DIRECTORY, CONFIG_DIRECTORY, 'gen')
+
 
 # FIXME: This doesn't yet support directory listings.  We'll do something like:
 # http://tools.cherrypy.org/wiki/staticdirindex
@@ -30,14 +34,25 @@ def main():
             'tools.staticdir.on': True,
             'tools.staticdir.dir': os.path.abspath(args.app_path),
         },
-        '/sky': {
-            'tools.staticdir.on': True,
-            'tools.staticdir.dir': os.path.join(GEN_DIRECTORY, 'sky'),
-        },
         '/mojo': {
             'tools.staticdir.on': True,
-            'tools.staticdir.dir': os.path.join(GEN_DIRECTORY, 'mojo'),
-        }
+            'tools.staticdir.dir': os.path.join(GEN_ROOT, 'mojo'),
+        },
+        '/sky': {
+            'tools.staticdir.on': True,
+            'tools.staticdir.dir': os.path.join(GEN_ROOT, 'sky'),
+        },
+        # src-relative to avoid needing to rebuild when changing inspector:
+        '/sky/framework': {
+            'tools.staticdir.on': True,
+            'tools.staticdir.dir':
+                os.path.join(SKY_ROOT, 'framework'),
+        },
+        '/sky/framework/inspector/server': {
+            'tools.staticdir.on': True,
+            'tools.staticdir.dir': os.path.join(GEN_ROOT, 'sky', 'framework',
+                'inspector', 'server'),
+        },
      }
     cherrypy.quickstart(config=config)
 
diff --git a/tools/skydb b/tools/skydb
index cfe1996ce64..de74aadbb0e 100755
--- a/tools/skydb
+++ b/tools/skydb
@@ -58,7 +58,10 @@ def main():
     if args.gdb:
         shell_command = ['gdb', '--args'] + shell_command
 
-    print ' '.join(shell_command)
+    print "To inspect, include:"
+    print '<link rel="import" href="/sky/framework/inspector/inspector.sky" />'
+    print "And open:"
+    print "chrome-devtools://devtools/bundled/devtools.html?ws=localhost:9898"
     subprocess.check_call(shell_command)