TODO list, some minor fixes