fixes, refactoring, add new langs
fixes, refactoring, add new langs
fixes, refactoring, add new langs