fix: properly ordered lambdas and taking care of diffusion time is None