(I take it you want to have pi/2, pi, 3pi/2 etc, instead of pi, 2pi, 3pi)

Yes - you're absolutely right. :/