more changes for events and timelines

Made events more explicit. Fixed timelines.