resolve some TODOs, change todo.md formatting