some fixes got some improvements