fixed the PR comments

Fixes the issues raised on #2