Add command line arguments and fix wrong/missing comments