Making fixes for  #341 #298 #397

Still need to look into the colDef.width merge more.