Fixes for site changes. Behaves better when site is changed or down. Temporary fixes for new bugs.