Fixed regexes, still more bugs