Exploratory misc updates