More command line arguments, + fix