Made corrections and changes to the 3 first sections.
Add few TODOs.