Fix some plot issues when NFP differs from one for objects, or when passed-in phi exceeds 2pi/nfp

Fix some plot issues when NFP differs from one for objects, or when passed-in phi exceeds 2pi/nfp #7500