Added a few new TODOS, cleared old ones