Review; Adding more doc, adding and removing TODOs.
Still not done.