various updates, esp. to broken metrics reporting