Continued optimization synthesis

Summary
Continued optimization of synthesis and analysis for WP2,3,4,5.