Upd: many fixes.