Added todo-list entries.

Fixed an undeclared local variable.
Merge pull request #2 from sebasguts/master

Added todo-list entries.