Fix TODO list and add more tasks there