final speedup. Added missing format files. fixed bugs.