some improvements; #1