fixed mistake in setting value for geo_p parameter; changed normalising constant for DE contribution to depend on expectation without DEs