A few more comments added in places.