hacking some quick replaceFirsts() and fixing national formatting bug