add upstream improvements, such as --verbose flag for results