review feedback and a minor fix