All regex stuff fixed, I think.