Correct cables according to engineering drawings. Overlaps with PFCal have been eliminated.