Reactivated initial Z shape fit (was off for RnD reasons); removed superfluous (and commented) p-value calculation