update UA code & some fix