Done fixing up command line stuff.