Event Markup improvements.
Further Markup improvements on the events