Fix measuring pressure at oil peak + other small changes