a few more standards tweaks