Extend typo system to support all characters

Extended typo system and removed couple lines of useles code