Fix various SI/TI related things
Update ug.js