improve constr parsing
upd key error
upd finder errors