Fix stuff.  Use perl as a better grep, because the grep manual page
warns about the "-P"-flag.