event tweak fixed
giant tweaks