Good catches (this and below)