fixed various col/row add/span bugs