minor changes in TODO according to everything done