. some improvements