Change configure site; improvements