fixing the bad offsets, removing self collisions for the arm
merge