PR comments, add explanatory text, fix bugs