diff --git a/.local/bin/audio_notify b/.local/bin/audio_notify
index 1ce428e..fae0871 100755
--- a/.local/bin/audio_notify
+++ b/.local/bin/audio_notify
@@ -19,8 +19,8 @@ else
 	case "$level" in
 		[0-9]|1[0-9]|2[0-9]|3[0-9]|4[0-9]|5[0-9]) criticity="low" ;;
 		6[0-9]|7[0-9]) criticity="normal" ;;
-		8[0-9]|9[0-9]|10[0-9]) criticity="critical" ;;
+		*) criticity="critical" ;;
 	esac
 
-	dunstify -r 100002 -u "$criticity" "Current pamixer value :" "$level%"
+	dunstify -r 100002 -u "$criticity" "Current volume :" "$level%"
 fi
diff --git a/.local/bin/player b/.local/bin/player
index bcf5b25..24bd594 100755
--- a/.local/bin/player
+++ b/.local/bin/player
@@ -14,8 +14,8 @@ if [ "$1" = "stop" ]; then
 	mpc $1
 	dunstify -r 10010 -u "normal" "MPD" "Music stopped"
 else
-	export MPC_FORMAT="Artist: <b>%artist%</b> \nTitle: %title% \nAlbum: %album%"
-	out="$(mpc $1 | head -n-1)"
+	MPC_FORMAT="Artist: <b>%artist%</b> \nTitle: %title% \nAlbum: %album%"
+	out="$(mpc --format "$MPC_FORMAT" $1 | head -n-1)"
 	path="$(mpc --format %file% | head -n1 | awk -F '/' '{ printf "music/%s/%s/cover.png\n", $1,$2 }')"
 
 	dunstify -r 10010 -u "normal" -i "$HOME/$path" "MPD" "$out"