A bunch of editorial adjustments after review