Regexes, better dict args, and identifiers fix