more testing and fixing regexes.