Lergo 79 86 review comments

Merging review comments