misc changes to ut
misc chgs bugfixes