Updates to general TODO notes.