Final changes

Final changes after checking all questions from the peer assessment.