Correct TYPEs in UA, and add missing items.