Fixed goto and trapped the true angle to be between -pi and pi.