Regex stuff fixed