getting my fork in sync.

Inane remarks in the TODO's not helpful. Remove TODO's that are done, don't touch TODO's that aren't.