fixed some task bugs