single-site settings support

and several other fixes