some ufixes