Various minor UFD improvements, comments, tests, etc... still a lot to unsnarl