diff --git a/src/_httpie b/src/_httpie
index dce6100..f1ea38d 100644
--- a/src/_httpie
+++ b/src/_httpie
@@ -122,31 +122,31 @@ _httpie_printflags () {
 integer NORMARG
 
 _arguments -n -C -s \
-  '(-f)'{-j,--json}'[Data items from the command line are serialized as a JSON object.]' \
-  '(-j)'{-f,--form}'[Data items from the command line are serialized as form fields.]' \
-  '--pretty[Controls output processing.]:PRETTY:(all colors format none)' \
-  '(-s --style)'{-s,--style}'[Output coloring style]:STYLE:(autumn borland bw colorful default emacs friendly fruity manni monokai murphy native pastie perldoc ttr solarized tango trac vim vs)' \
+  '(-j --json -f)'{-j,--json}'[Data items from the command line are serialized as a JSON object.]' \
+  '(-f --form -j)'{-f,--form}'[Data items from the command line are serialized as form fields.]' \
+  '--pretty=[Controls output processing.]:output format:(all colors format none)' \
+  '(-s --style)'{-s,--style}'=[Output coloring style]:STYLE:(autumn borland bw colorful default emacs friendly fruity manni monokai murphy native pastie perldoc ttr solarized tango trac vim vs)' \
   '(-p --print)'{-p,--print}'=[String specifying what the output should contain]:print flags:_httpie_printflags' \
   '(-v --verbose)'{-v,--verbose}'[Print the whole request as well as the response.]' \
-  '(-p)'{-h,--headers}'[Print only the response headers.]' \
-  '(-p)'{-b,--body}'[Print only the response body.]' \
+  '(-p -h --headers)'{-h,--headers}'[Print only the response headers.]' \
+  '(-p -b --body)'{-b,--body}'[Print only the response body.]' \
   '(-S --stream)'{-S,--stream}'[Always stream the output by line, i.e., behave like `tail -f`.]' \
-  '(-o --output)'{-o,--output}'[Save output to FILE.]:FILE:_files' \
-  '(-d --download)'{-d,--download}'[Do not print the response body to stdout.]' \
+  '(-o --output)'{-o,--output}'=[Save output to FILE.]:output file:_files' \
+  '(-d --download)'{-d,--download}'=[Do not print the response body to stdout.]' \
   '(-c --continue)'{-c,--continue}'[Resume an interrupted download.]' \
-  '--session[Create, or reuse and update a session.]:SESSION_NAME_OR_PATH' \
-  '--session-read-only[Create or read a session without updating it form the request/response exchange.]:SESSION_NAME_OR_PATH' \
-  '(-a --auth)'{-a,--auth}'[If only the username is provided (-a username)]:USER\:PASS' \
-  '--auth-type[The authentication mechanism to be used. Defaults to "basic".]:AUTH-TYPE:(basic digest)' \
-  '--proxy[String mapping protocol to the URL of the proxy (e.g.http:foo.bar:3128).]:PROXY' \
-  '--follow[Set this flag if full redirects are allowed]' \
-  "--verify[Set to \"no\" to skip checking the host's SSL certificate.]:verify certificate:(yes no)" \
+  '(--session-read-only)--session=[Create, or reuse and update a session.]:session name (or path)' \
+  '(--session)--session-read-only=[Create or read a session without updating it form the request/response exchange.]:session name (or path)' \
+  '(-a --auth)'{-a,--auth}'=[If only the username is provided (-a username)]:USER\:PASS' \
+  '--auth-type=[The authentication mechanism to be used. Defaults to "basic".]:AUTH-TYPE:(basic digest)' \
+  '--proxy=[String mapping protocol to the URL of the proxy.]:PROXY' \
+  '--follow[Allow full redirects.]' \
+  "--verify=[Enable or disable verification of ssl certificates.]:verify certificate:(yes no)" \
   '--allow-redirects[Set this flag if full redirects are allowed (e.g. re-POST-ing of data at new ``Location``)]' \
-  '--timeout[Float describes the timeout of the request (Use socket.setdefaulttimeout() as fallback).]:timeout (seconds)' \
+  '--timeout=[Float describes the timeout of the request (Use socket.setdefaulttimeout() as fallback).]:timeout (seconds)' \
   '--check-status[This flag instructs HTTPie to also check the HTTP status code and exit with an error if the status indicates one.]' \
   '--ignore-stdin[Do not attempt to read stdin.]' \
-  '--help[show help message.]' \
-  "--version[show program's version number and exit.]" \
+  '(- *)--help[show help message.]' \
+  "(- *)--version[show program's version number and exit.]" \
   '--traceback[Prints exception traceback should one occur.]' \
   '--debug[Prints exception traceback should one occur and other information useful for debugging HTTPie itself.]' \
   '*:args:_httpie_params' && return 0