Add voting, fix capturing