Add answers to questions in the notebook
Reorganize some questions