translate more shit
merged