Add save command line option
Fix setup