minor modifs to task/thread