update and fixes from otx 2.10