diff -u a/buzz b/buzz
--- a/buzz      2010-12-19 16:15:43.083335660 +0100
+++ b/buzz      2010-12-19 16:19:48.763335696 +0100
@@ -4,10 +4,37 @@
 USER=""
 PASSWORD=""

+usage ()
+{
+  echo "usage: `basename $0` [mode=auto|manual] [speed=42k|1m]"
+  echo "       mode=auto     downloads files in your basket"
+  echo "       mode=manual   fire up an editor to specify the list of files to downlaod"
+  echo "       speed=        limit download rate"
+}
+
+for arg in $@; do
+  case $arg in
+    mode=*)
+      case ${arg:5} in
+        auto) MODE="auto";;
+        manual) MODE="manual";;
+        *) usage; exit 1;;
+      esac
+    ;;
+    speed=*)
+      SPEED_CAP=${arg:6}
+    ;;
+    *)
+      usage
+      exit 1
+    ;;
+  esac
+done
+
 WGET=`which wget` # to use curl instead of wget just replace with empty string ''
 CURL=`which curl`

-EDITOR='mate -w' # $EDITOR (nano, emacs) or mate -w for good people
+EDITOR="${EDITOR:-'mate -w'}" # $EDITOR (nano, emacs) or mate -w for good people
 MODE="auto" # auto (using buzz's basket system) or manual (editing a url file)
 URL_BASKET=""
 FILE_LIST="list.txt"
@@ -19,13 +46,13 @@
 # env vars completion
 if [ "$USER" = "" ]
 then
-  echo "Username: \c"
+  echo -n "Username: "
   read USER
 fi

 if [ "$PASSWORD" = "" ]
 then
-  echo "Password: \c"
+  echo -n "Password: "
   stty -echo
   read PASSWORD
   stty echo
@@ -35,26 +62,6 @@
 WGET_ARGS="${WGET_ARGS} --http-user=${USER} --http-password=${PASSWORD}"
 CURL_ARGS="${CURL_ARGS} -u ${USER}:${PASSWORD}"

-for arg in  $@; do
-    if [ $arg = "auto" ]
-    then
-      MODE="auto"
-      continue
-    fi
-    if [ $arg = "manual" ]
-    then
-      MODE="manual"
-      continue
-    fi
-    if [ $arg = "help" ]
-    then
-      echo "./buzz [auto|manual] [42k|1m]"
-      exit 0
-    fi
-    SPEED_CAP="$arg"
-done
-
-
 # speed limit
 if [ "$SPEED_CAP" != "none" ]
 then