Finish up and fix #587, open specific issues for any outliers