just some improvements