Fixing up most of the command line interfaces