Optimise data loop for speed
Fix references to .pc