Add cell spanning and double lines
Tweak last rev; unit tests; 4.20a