Several math r65 updates and fixes