Added some TODOs.
Moved TODOs to issues.