Performance tweaks
4.20d: table rule lines throw off count; add cell alignment