Don't add a space between the filename: and the matched line - consistent with grep
improve passing of [-+]t and [-+]B, and add to usage