fix regexes for bw, eta, etc

[Skylark13]

Other pull requests exist for this but I made minimal changes, and my changes will work with older versions too.

It's possible this repo is dead though, but just in case...