tweaks and fmt