some improvements of tutorial