Comments added.
TODOs added.