Many small revisions after feedback from David