Adding more regex.
Minor updates.