More comments and adjustments