fmt and other tweaks