fix up some inconsistencies in row height/col width calculation