small fixes / upd