Better matching of pictures to normalized time
More normalization changes