Site url fix

Site url fix and other updates