Small fixes and es translation completed