improvements from the first round of feedback, see #2885 and #2887