clean up/clarify TODO list