Improve translation and fix another problems