The bit about him spilling olive oil onto someone's dress then playing it off with a flirtatious joke seems very strange to me. Maybe it's just my upbringing but trying to pull off a joke like that in a tense situation seems very risky. I would be worried about coming off unserious, indifferent, and sleazy while also stoking an even angrier reaction from the person.