Fixing rendering and normalization to support large number of files