fixes based on review feedback