more format tweaks