Small fixes and full translation