--comments from face to face today

Includes other change requests discussed in face to face as well.