working translation, fixed a few bugs