fix more parameters and replace boost int types with std int types