Today
Merge from ai_scientist_iteration, fix more compile errors