some improvements

some improvements