minor fixes & new tasks added