Making a few corrections based on comments.