Put back asides that had gotten lost, and add formatting to some comments