changes from comments on review