Merge branch 'develop' into beta

Updates including better regexes, bug fixes, and speed improvements