diff --git a/src/_rvm b/src/_rvm
index d1304a1..e9604e1 100644
--- a/src/_rvm
+++ b/src/_rvm
@@ -15,36 +15,34 @@
 #
 # ------------------------------------------------------------------------------
 
-
 local curcontext="$curcontext" state line cmds ret=1
 
 _arguments -C \
   '(- 1 *)'{-v,--version}'[display version information]' \
-  '(-l|--level)'{-l,--level}'+[patch level to use with rvm use / install]:number' \
-  '(--prefix)--prefix[path for all rvm files (~/.rvm/), with trailing slash!]:path:_files' \
-  '(--bin)--bin[path for binaries to be placed (~/.rvm/bin/)]:path:_files' \
-  '(--source)--source[src directory to use (~/.rvm/src/)]:path:_files' \
-  '(--archives)--archives[directory for downladed files (~/.rvm/archives/)]:path:_files' \
+  '(-l --level)'{-l,--level}'+[patch level to use with rvm use / install]:number' \
+  '--bin[path for binaries to be placed (~/.rvm/bin/)]:path:_files' \
+  '--source[src directory to use (~/.rvm/src/)]:path:_files' \
+  '--archives[directory for downladed files (~/.rvm/archives/)]:path:_files' \
   '-S[Specify a script file to attempt to load and run (rubydo)]:file:_files' \
   '-e[Execute code from the command line]:code' \
-  '(-G)-G[root gem path to use]:path:_files' \
-  '(--gems)--gems[Used to set the gems_flag, use with remove to remove gems]' \
-  '(--archive)--archive[Used to set the archive_flag, use with remove to remove archive]' \
-  '(--patch)--patch[With MRI Rubies you may specify one or more full paths to patches]' \
-  '(-C|--configure)'{-C,--configure}'=[custom configure options]' \
-  '(--nice)--nice[process niceness (for slow computers, default 0)]:number' \
-  '(--ree)--ree-options[Options passed directly to ree ./installer on the command line]:options' \
-  '(--head)--head[with update, updates rvm to git head version]' \
-  '(--rubygems)--rubygems[with update, updates rubygems for selected ruby]' \
-  '(--default)--default[with ruby select, sets a default ruby for new shells]' \
-  '(--debug)--debug[Toggle debug mode on for very verbose output]' \
-  '(--trace)--trace[Toggle trace mode on to see EVERYTHING rvm is doing]' \
-  '(--force)--force[Force install, removes old install & source before install]' \
-  '(--summary)--summary[Used with rubydo to print out a summary of the commands run]' \
-  '(--latest)--latest[with gemset --dump skips version strings for latest gem]' \
-  '(--gems)--gems[with uninstall/remove removes gems with the interpreter]' \
-  '(--docs)--docs[with install, attempt to generate ri after installation]' \
-  '(--reconfigure)--reconfigure[Force ./configure on install even if Makefile already exists]' \
+  '-G[root gem path to use]:path:_files' \
+  '--gems[Used to set the gems_flag, use with remove to remove gems]' \
+  '--archive[Used to set the archive_flag, use with remove to remove archive]' \
+  '--patch[With MRI Rubies you may specify one or more full paths to patches]' \
+  '(-C --configure)'{-C,--configure}'=[custom configure options]' \
+  '--nice[process niceness (for slow computers, default 0)]:number' \
+  '--ree-options[Options passed directly to ree ./installer on the command line]:options' \
+  '--head[with update, updates rvm to git head version]' \
+  '--rubygems[with update, updates rubygems for selected ruby]' \
+  '--default[with ruby select, sets a default ruby for new shells]' \
+  '--debug[Toggle debug mode on for very verbose output]' \
+  '--trace[Toggle trace mode on to see EVERYTHING rvm is doing]' \
+  '--force[Force install, removes old install & source before install]' \
+  '--summary[Used with rubydo to print out a summary of the commands run]' \
+  '--latest[with gemset --dump skips version strings for latest gem]' \
+  '--gems[with uninstall/remove removes gems with the interpreter]' \
+  '--docs[with install, attempt to generate ri after installation]' \
+  '--reconfigure[Force ./configure on install even if Makefile already exists]' \
   '1: :->cmds' \
   '*: :->args' && ret=0
 
@@ -52,7 +50,7 @@ case $state in
 
   cmds)
 
-    cmds=( ${(f)"$(_call_program commands rvm help 2> /dev/null | sed -e '/^== Action/,/^== Implementation/!d; / - /!d; s/^[ *]*\([^ ]*\) *\- *\(.*\)/\1:\2/')"} )
+    cmds=( ${(f)"$(_call_program commands rvm help 2> /dev/null | sed -e '/^== Action/,/^== Implementation/!d; / \(::\|-\) /!d; s/^[ *]*\([^ *]*\)[ *]*\(::\|-\) *\(.*\)/\1:\3/')"} )
     cmds+=( $(rvm list strings) )
     _describe -t commands 'rvm command' cmds && ret=0
     ;;
@@ -65,7 +63,7 @@ case $state in
 
         if (( CURRENT == 3 )); then
           # See if we’ve made it to the ‘@’; eg, 1.9.2@
-          if ! \grep -q '@' <<< "${line[CURRENT-1]}" ; then
+          if ! GREP_OPTIONS="" \grep '@' <<< "${line[CURRENT-1]}" >/dev/null ; then
             _values -S , 'rubies' \
               $(rvm list strings | sed -e 's/ruby-\([^) ]*\)-\([^) ]*\)/ruby-\1-\2 \1-\2 \1/g') \
               default system $(rvm alias list | cut -d' ' -f1) && ret=0
@@ -88,8 +86,8 @@ case $state in
         if (( CURRENT == 3 )); then
           _values 'gemset_commands' $(rvm gemset | sed -e '/create/!d; s/^.*[{]\(.*\)[}].*$/\1/; s/,/ /g')
         else
-          #_values -S , 'gemsets' $(rvm gemset list | \grep -v gemset 2>/dev/null)
-          _values -S , 'gemsets' $(rvm gemset list | \grep -Ev '(gemset|info)' 2>/dev/null | awk '/^[ -_[:alnum:]]+$/ {print '$1'}')
+          #_values -S , 'gemsets' $(rvm gemset list | GREP_OPTIONS="" \grep -v gemset 2>/dev/null)
+          _values -S , 'gemsets' $(rvm gemset list | GREP_OPTIONS="" \grep -Ev '(gemset|info)' 2>/dev/null | awk '/^[ -_[:alnum:]]+$/ {print '$1'}')
         fi
         ret=0
         ;;