Issues/990 reader comment improvements

Fixes #990 
Fixes #841