File format tweaks; optimization