Added todo-list entries.

Fixed an undeclared local variable.