upd and fix