a few fixes based on review feedback