docopt -> argh fixes.  a couple minor changes too.