Many small updates, clean up some of anomaly scanner