+ Todo List and fix issues