some improvements

added some improvements