fixes based on review