Voting changes

Including previous commits (other pull request)