mqh: some changes