Responding to (some of) Ian's feedback