Fixed most of collisions, some strange behavior remains