Improve translation
Fix file paths