fix vote limit
update comments
Merge branch 'develop'