fixes for highlights and incorrect event data