Update combine script to handle alternate votes.
Various fixes.