Minor improvements. Also added --silent and --verbose parameters.