Update TODO; Tweak core and work queue a bit.