big ol fixes to USAT bug