(U_pdate) some fixes