fixed regexes and syntax errors in my (patrick's) files