Added fix for event 7
Added names to heats for friday
Added heat 4 and fixed name rendering bugs