Final minor changes (there was a feedback link...)