Merging previous stash and current catch-all regex branch

Merging previous stash with current regex branch to bring it up to date.
Still need to ensure that string recognition works, as it doesn't seem
to be functioning as intended.
Adding string fix for token identification