some last-minute improvements