Some more drafts, including fixed intersections bug?