further performance tweaks to new file format