Update stage0 to get sep-comp fixes.
Bring in the various sep-comp fixes.
Final tweaks to get a working stage1.