fix more math