improved merges, and fixes to boxes on matching.