translate and some fixes