final speedup. Added missing format files.