Cleanup and added --clear-log,--setup,--help,--dump-log