More last minute fixes
Even more fixes
(Hopefully) last changes for presentation