tweaks based on review feedback, checked with tests