some last minute fixes