Added some questions
Added some new notes, and completed some TODOs