more character replacements

This commit adds more character replacements. It probably needs some reviewing. @maslen, could you please take a look?