diff --git a/jetty-deploy/src/main/config/modules/deploy.mod b/jetty-deploy/src/main/config/modules/deploy.mod
index 5705ac61d91..47fc62c1774 100644
--- a/jetty-deploy/src/main/config/modules/deploy.mod
+++ b/jetty-deploy/src/main/config/modules/deploy.mod
@@ -2,6 +2,8 @@
 # Deploy Feature
 #
 
+DEPEND=webapp
+
 # Deploy jars
 LIB=lib/jetty-deploy-${jetty.version}.jar
 
diff --git a/jetty-distribution/src/main/resources/start.d/demo.ini b/jetty-distribution/src/main/resources/start.d/demo.ini
index bffdd8c0c54..d58746df4d4 100644
--- a/jetty-distribution/src/main/resources/start.d/demo.ini
+++ b/jetty-distribution/src/main/resources/start.d/demo.ini
@@ -11,4 +11,5 @@ jaas.login.conf=webapps.demo/test-jaas.d/login.conf
 # Activate the demo options and configurations
 MODULES=jndi.demo
 
+etc/jetty-demo.xml
 
diff --git a/jetty-jaas/src/main/config/modules/jaas.mod b/jetty-jaas/src/main/config/modules/jaas.mod
index d0d6f0fa463..2a608c74874 100644
--- a/jetty-jaas/src/main/config/modules/jaas.mod
+++ b/jetty-jaas/src/main/config/modules/jaas.mod
@@ -2,6 +2,8 @@
 # JAAS Feature
 #
 
+DEPEND=server
+
 # JAAS jars
 LIB=lib/jetty-jaas-${jetty.version}.jar
 
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/Module.java b/jetty-start/src/main/java/org/eclipse/jetty/start/Module.java
index 78a679bbe24..23ba1b4aa75 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/Module.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/Module.java
@@ -87,11 +87,21 @@ public class Module extends TextFile
 
     public void addChildEdge(Module child)
     {
+        if (childEdges.contains(child))
+        {
+            // already present, skip
+            return;
+        }
         this.childEdges.add(child);
     }
 
     public void addParentEdge(Module parent)
     {
+        if (parentEdges.contains(parent))
+        {
+            // already present, skip
+            return;
+        }
         this.parentEdges.add(parent);
     }
 
@@ -149,7 +159,7 @@ public class Module extends TextFile
     {
         return optionalParentNames;
     }
-    
+
     public Set<Module> getParentEdges()
     {
         return parentEdges;
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/README.txt b/jetty-start/src/main/java/org/eclipse/jetty/start/README.txt
index 3669750495d..f366541f130 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/README.txt
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/README.txt
@@ -9,11 +9,11 @@ Jetty start.jar provides a cross platform replacement for startup scripts.
 It makes use of executable JAR that builds the classpath and then executes
 jetty.
 
-To run with all the demo options:
+To run with the demo module:
 
-  java -jar start.jar OPTIONS=All
+  java -jar start.jar MODULES=demo
 
-To run with the default options:
+To run with the default modules:
 
   java -jar start.jar
 
@@ -31,15 +31,15 @@ To see the available options
 
 To run with JSP support (if available)
 
-  java -jar start.jar OPTIONS=Server,jsp
+  java -jar start.jar MODULES=jsp
 
 To run with JMX support
 
-  java -jar start.jar OPTIONS=Server,jmx etc/jetty-jmx.xml etc/jetty.xml
+  java -jar start.jar MODULES=jmx
 
 To run with JSP & JMX support
 
-    java -jar start.jar OPTIONS=Server,jsp,jmx etc/jetty-jmx.xml etc/jetty.xml
+    java -jar start.jar MODULES=jsp,jmx
 
 Note that JSP requires the jasper jars to be within $JETTY/lib/jsp  These 
 are currently not distributed with the eclipse release and must be
diff --git a/jetty-websocket/javax-websocket-server-impl/src/main/config/modules/websocket.mod b/jetty-websocket/javax-websocket-server-impl/src/main/config/modules/websocket.mod
index e61ec33e184..a74a1072ac2 100644
--- a/jetty-websocket/javax-websocket-server-impl/src/main/config/modules/websocket.mod
+++ b/jetty-websocket/javax-websocket-server-impl/src/main/config/modules/websocket.mod
@@ -7,7 +7,7 @@ DEPEND=server
 DEPEND=annotations
 
 # WebSocket needs websocket jars (as defined in start.config)
-LIB=lib/websockets/*.jar
+LIB=lib/websocket/*.jar
 
 # WebSocket needs websocket configuration
 etc/jetty-websockets.xml