More responses to referees, tidying, etc.