Some final changes, with some feedback from Bernard.