fixed collisions + cleanup