more minor event driven bug fixes
fixed annoying bug