Add core events. Minor changes.