Phonemove wasn't properly converted to the cleaner format, so I finished it up. Also got distracted with regex and fixed some of it