Index: main/src/main/java/org/apache/karaf/main/Main.java
===================================================================
--- main/src/main/java/org/apache/karaf/main/Main.java	(revision 1038896)
+++ main/src/main/java/org/apache/karaf/main/Main.java	(working copy)
@@ -777,6 +777,7 @@
                         if (karafBase.equals(karafHome)) {
                         	f = new File(karafHome, location);
                         } else {
+                        	/* something is wrong here, i'm guessing you want the karafBase, and not the second */
                         	f = new File(karafBase, location);
                         	f = new File(karafHome, location);
                         }
Index: webconsole/admin/src/main/java/org/apache/karaf/webconsole/admin/AdminPlugin.java
===================================================================
--- webconsole/admin/src/main/java/org/apache/karaf/webconsole/admin/AdminPlugin.java	(revision 1038896)
+++ webconsole/admin/src/main/java/org/apache/karaf/webconsole/admin/AdminPlugin.java	(working copy)
@@ -101,6 +101,7 @@
         pw.println("</script>");
     }
 
+    /** note that javaopts/javaOpts are cased differently for create vs start which is very confusing as getParameter is case sensitive */
     @Override
     protected void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
         boolean success = false;
Index: webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/Terminal.java
===================================================================
--- webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/Terminal.java	(revision 1038896)
+++ webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/Terminal.java	(working copy)
@@ -580,7 +580,7 @@
                 // Alternate screen mode
                 if ((state && !vt100_mode_alt_screen) || (!state && vt100_mode_alt_screen)) {
                     int[] s = screen; screen = screen2; screen2 = s;
-                    Map<String, Object> map = vt100_saved; vt100_saved = vt100_saved2; vt100_saved = map;
+                    Map<String, Object> map = vt100_saved; vt100_saved = vt100_saved2; vt100_saved2 = map;
                 }
                 vt100_mode_alt_screen = state;
             // ?57 : DECNAKB: Greek keyboard mapping
Index: shell/obr/src/main/java/org/apache/karaf/shell/obr/FindCommand.java
===================================================================
--- shell/obr/src/main/java/org/apache/karaf/shell/obr/FindCommand.java	(revision 1038896)
+++ shell/obr/src/main/java/org/apache/karaf/shell/obr/FindCommand.java	(working copy)
@@ -40,7 +40,6 @@
     List<String> requirements;
 
     protected void doExecute(RepositoryAdmin admin) throws Exception {
-        List<Resource> matching = new ArrayList<Resource>();
         Resource[] resources = admin.discoverResources(parseRequirements(admin, requirements));
         if (resources == null)
         {
Index: features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java
===================================================================
--- features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java	(revision 1038896)
+++ features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java	(working copy)
@@ -307,11 +307,6 @@
 	                        try {
 	                            b.start();
 	                        } catch (BundleException be) {
-	                            String[] msgdata = new String[]{
-	                                b.getLocation(),
-	                                getFeaturesContainingBundleList(b),
-	                                be.getMessage()
-	                            };
 	                            String msg = format("Could not start bundle %s in feature(s) %s: %s", b.getLocation(), getFeaturesContainingBundleList(b), be.getMessage());
 	                            throw new Exception(msg, be);
 	                        }
@@ -859,7 +854,6 @@
 
     protected Configuration findExistingConfiguration(ConfigurationAdmin configurationAdmin,
                                                       String pid, String factoryPid) throws IOException, InvalidSyntaxException {
-        String key = (factoryPid == null ? pid : pid + "-" + factoryPid);
         String filter;
         if (factoryPid == null) {
             filter = "(" + Constants.SERVICE_PID + "=" + pid + ")";
@@ -1074,7 +1068,7 @@
         Set<Feature> features = new HashSet<Feature>();
         for (Map<String, Feature> featureMap : this.getFeatures().values()) {
             for (Feature f : featureMap.values()) {
-                if (f.getBundles().contains(bundle.getLocation())) {
+                if (f.getBundles().contains(bundle)) {
                     features.add(f);
                 }
             }
Index: jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngine.java
===================================================================
--- jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngine.java	(revision 1038896)
+++ jaas/modules/src/main/java/org/apache/karaf/jaas/modules/jdbc/JDBCBackingEngine.java	(working copy)
@@ -189,7 +189,7 @@
                 listUserStatement = connection.prepareStatement(selectUsersStatement);
                 usersResultSet = listUserStatement.executeQuery();
                 while (!usersResultSet.next()) {
-                    String username = usersResultSet.getString(0);
+                    String username = usersResultSet.getString(1);
                     users.add(new UserPrincipal(username));
                 }
             } catch (SQLException e) {