Changes following final feedback from users

Changes following final feedback from users.