Added better collisions and events