Regex additions / fixes