docopts error handling, menu adjustments