Regex fixes

have most of my tests working