Cleanup with separate settings depending on Dataset
Removed NaN's from log(P/Q) wich caused NaN's for the iteration error