geometry and measure revision