Some PR comments adressed