TODO list and minor typos