some last minute improvements