merge in 2-char operators into main keywork table, other merges