misc format tweaks