Fixes and complete translation