short fixes + switch to map vote for admins