fixed event flagging (hopefully) minor tweaks