some clean-ups and added warm-up time before measurements