rename & some improvements