Add a few TODO list
fix typos