code cleanup, added unit tests
translit fixed, code cleanup, tests up