Fixed review comments.
Highlights.
Update after discussion with Fredrik.