Translation files & some improvements