tasks bugs fixed