new batch of measurements
some cleanup