Changes addressing comments.