Voting stuff improvements