regressions to border-*-width and counter-increment; other tweaks