Fixed some title problems, regexes are much better match now