of course some last minute fixes