couple RegEx additions & tweaks, seeing great accuracy now