Changes to reflect 91 refinement requests in 142, and from convos
Recommit of this branch including 142

This reverts commit ace4300e23f75b5f23c8a3077942f3e05824392f.