diff --git a/Makefile b/Makefile
index 1b4e939..cd5dd04 100644
--- a/Makefile
+++ b/Makefile
@@ -15,8 +15,8 @@ $(BUILDDIR):
 
 
 $(TARGET): $(OBJECTS)
-	$(CC) $^ -o $(BUILDDIR)/$@ -lboost_filesystem -lboost_system -lboost_program_options -lpthread
-
+	$(CC) $^ -o $(BUILDDIR)/$@ -lboost_filesystem -lboost_system
+#-lboost_program_options
 
 $(OBJECTS): $(BUILDDIR)/%.o : $(SOURCEDIR)/%.cpp
 	$(CC) $(CFLAGS) $< -o $@
diff --git a/src/Constant.h b/src/Constant.h
index d739a8c..d9885e8 100644
--- a/src/Constant.h
+++ b/src/Constant.h
@@ -11,8 +11,8 @@
 #include "Types.h"
 
 #define VERSION "smrtlink (v1.1 Linux)\n"
-#define USAGE "usage: %s [-bdhjrvswx] [-i interface] [-u [password:]username]\n\
-	[-p password] <command>\n\n"
+#define USAGE "usage: %s [-bdhjrvVstwx] [-i interface] [-U [password:]username]\n\
+	[-P password] <command>\n\n"
 #define HELP "\
     Option Summary:\n\
         -h --help               This help text\n\
@@ -24,7 +24,7 @@
         -i --interface <iface>  only use one Interface\n\
         -t --timeout <n>        Timeout in milliseconds. Default: 180\n\
         -w --wait               Not yet implemented: blocking until operation is completed\n\
-        -s --permanent          Not yet implemented: make changes immediately permanent\n\
+        -s --permanent          make changes immediately permanent\n\
 \
         -b --header             Show header\n\
         -t --text               Display Packets as readable Text (default)\n\
@@ -48,8 +48,8 @@
                         Not yet implemented\n\
         set <property1>=<value> [<property2>=<value> [...]]\n\
                         Not yet implemented\n\
-        get|save        Not yet implemented: save config to file\n\
-        set|restore     Not yet implemented: restore onfig from file\n\
+        save            Not yet implemented: save config to file\n\
+        restore         Not yet implemented: restore onfig from file\n\
         flash           Not yet implemented: replace firmware\n\
         reboot          Not yet implemented\n\
         reset           Not yet implemented\n\n\
diff --git a/src/smrtlink.cpp b/src/smrtlink.cpp
index 9e391cb..73462ba 100644
--- a/src/smrtlink.cpp
+++ b/src/smrtlink.cpp
@@ -46,8 +46,8 @@ int main(int argc, char *argv[]) {
             "verbose", no_argument, 0, 'v' }, { "help", no_argument, 0, 'h' }, {
             "reverse", no_argument, 0, 'r' },
             { "permanent", no_argument, 0, 's' }, { "debug", optional_argument,
-                    0, 'd' }, { "password", required_argument, 0, 'p' }, {
-                    "user", required_argument, 0, 'u' }, { "interface",
+                    0, 'd' }, { "password", required_argument, 0, 'P' }, {
+                    "user", required_argument, 0, 'U' }, { "interface",
                     required_argument, 0, 'i' }, { "header", required_argument,
                     0, 'b' }, { "hex", required_argument, 0, 'x' }, { "file",
                     required_argument, 0, 'f' }, { "timeout", required_argument,
@@ -56,7 +56,7 @@ int main(int argc, char *argv[]) {
 
 
 
-    while ((opt = getopt_long(argc, argv, "bhrvXIswxP:U:i:f:t:d::", longopts,
+    while ((opt = getopt_long(argc, argv, "bhrvVXIswxP:U:i:f:t:d::", longopts,
             &index)) != -1) {
         switch (opt) {