Add restart and fix bad argument list