Format tweaks, complete through 2012