fixes based on review comment.