updates to character matching regexs