line 89
fixed event/collision issues