various changes/fixes to sub votes, end match, say