Updates from user tests

Updates requested by Sherry M. & Keith S.