added the new regex stuff and now getting better matches.