some fixes and translations