fixed collsion bug, melee direction in progress