Minor tweaks.
Fixed bug in docopt