Fixed bad checkin and cleaned up todo.txt