Fixed command line arguments to work better