now accepts command line arguments, clean up