fixed master with test-branch xmax/ programs