some last-moment additions