Text changes of first review

Based on feedback from Wolfgang and Tariq