Improve argument handling and provide help text