Updates to command line scripts