Regex Matching, Minor Fixes