Minor changes of Todos and Issues