[upd] various improvement