Minor updates from feedback from Patrick