[upd] some bug fixes