fixes based on review comments.