measurements, small fixes