Translation and small fixes