Update fixes

Improve full site switching,
finish lab