fix server events & collisions bugs