updated uniclass2 with temporary structural fixes