Added todos
Changed section name
Minor corrections