new version

various regex fixes
added various new regex