some improvements some new ones