use task.id attribute, minor fixes