improve norm event handling clarity and robustness