diff --git a/.gitmodules b/.gitmodules
index 844157011..d39d8b368 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,7 +6,7 @@
 	url = git://github.com/eressea/crypto.git
 [submodule "cmake"]
 	path = cmake
-	url = git://github.com/eressea/cmake.git
+	url = git://github.com/badgerman/cmake.git
 [submodule "quicklist"]
 	path = quicklist
 	url = git://github.com/badgerman/quicklist.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 55808a6a2..5258613d6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,10 +20,10 @@ find_package (LibXml2 REQUIRED)
 find_package (Curses REQUIRED)
 find_package (SQLite3 REQUIRED)
 
+add_subdirectory (src server)
 add_subdirectory (crypto)
 add_subdirectory (quicklist)
 add_subdirectory (iniparser)
 add_subdirectory (cutest)
 add_subdirectory (critbit)
 add_subdirectory (core/src eressea)
-add_subdirectory (src server)
diff --git a/src/main.c b/src/main.c
index 99b041047..3bdeb31c7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -72,6 +72,19 @@ static int usage(const char *prog, const char *arg)
   return -1;
 }
 
+static int get_arg(int argc, char **argv, size_t len, int index, const char **result, const char *def) {
+  if (argv[index][len]) {
+    *result = argv[index]+len;
+    return index;
+  }
+  if (index+1 < argc) {
+    *result = argv[index];
+    return index+1;
+  }
+  *result = def;
+  return index;
+}
+
 static int parse_args(int argc, char **argv, int *exitcode)
 {
   int i;
@@ -94,36 +107,39 @@ static int parse_args(int argc, char **argv, int *exitcode)
         return usage(argv[0], argv[i]);
       }
     } else {
+      const char *arg;
       switch (argv[i][1]) {
-        case 'C':
-          entry_point = NULL;
-          break;
-        case 'l':
-          logfile = argv[i][2] ? argv[i]+2 : argv[++i];
-          break;
-        case 'e':
-          entry_point = argv[i][2] ? argv[i]+2 : argv[++i];
-          break;
-        case 't':
-          turn = atoi(argv[i][2] ? argv[i]+2 : argv[++i]);
-          break;
-        case 'q':
-          verbosity = 0;
-          break;
-        case 'v':
-          verbosity = atoi(argv[i][2] ? argv[i]+2 : argv[++i]);
-          break;
-        case 'h':
-          usage(argv[0], NULL);
-          return 1;
-        default:
-          *exitcode = -1;
-          usage(argv[0], argv[i]);
-          return 1;
+      case 'C':
+        entry_point = NULL;
+        break;
+      case 'l':
+        i = get_arg(argc, argv, 2, i, &logfile, 0);
+        break;
+      case 'e':
+        i = get_arg(argc, argv, 2, i, &entry_point, 0);
+        break;
+      case 't':
+        i = get_arg(argc, argv, 2, i, &arg, 0);
+        turn = atoi(arg);
+        break;
+      case 'q':
+        verbosity = 0;
+        break;
+      case 'v':
+        i = get_arg(argc, argv, 2, i, &arg, 0);
+        verbosity = arg ? atoi(arg) : 0xff;
+        break;
+      case 'h':
+        usage(argv[0], NULL);
+        return 1;
+      default:
+        *exitcode = -1;
+        usage(argv[0], argv[i]);
+        return 1;
       }
-	}
+    }
   }
-
+  
   switch (verbosity) {
   case 0:
     log_stderr = 0;