fixed some over-aggressive/incorrect regexes