minor fixes; restore trigonometrics header