command line fixes and saving