some corrections and last-minute updates