Many fixes plus add Barbara Boxer and Jeff Merkley