some improvements
fixes