Rework event, fix some details