Fixed some last-minute details