1. task_id is 64 bit now
2. cleanups