remove some hard-coded conversion factors, fix merge mistake in pressure calculation