minor changes; left todo:concurrent & tcb