Fix a vote bug
Improvements