translation and other small fixes