comparator error not fixed, major updates to Dwrch, DoubleMath separated