update to regexes to fix small bugs