Format tweaks, complete through 2013