various last-minute corrections