translation and some todos added