weapon switching, restarting map settings and small fixes