bugs in UF almost fixed