fixed Plane intersection + misc arch cleanup