Update TODO with a few new thoughts