Updated the requirements.

...and minor changes to the TODO list.