Fixed path to main site respecting envs. Tweaks.