Update TODO with plan for next session of improvements