Added TODOs.
Cleaned some comments.