Refactored map vote and some fixes