Translating & fixing minor issues