change item to task and some improvements