Removed outdated comment.
Added two TODO notes.