commiting some improvements