Collisions and Basic Melee attacks updated