add todo.txt; fix two bugs;