(U_pdate) some fixes
(U_pdate) some fixes