Improve help text, add short-hand options.