Revamped general siteinfo collection to include more data.