Updated todo list and issues