Added more info for sites, exposed some issues