Added command line arguments, changed names