diff --git a/mini.cpp b/mini.cpp
index 2f92f0b..e8c7b2d 100644
--- a/mini.cpp
+++ b/mini.cpp
@@ -214,7 +214,9 @@ int main(int argc,char*argv[]){
 
         reinit();
         initaudio();
+#ifdef DEBUG
         debug("MINI v%s\n",MINI_VERSION);
+#endif
         lua_init(lua_files);
         lua_call_init();
 
@@ -1002,7 +1004,7 @@ void playmusic(const char *filename, const int volume) {
     if (music != NULL) Mix_FreeMusic(music);
     music = Mix_LoadMUS_RW(SDL_RWFromMem(buffer, size), 1);
     Mix_PlayMusic(music, -1);
-    if (volume!=-1) Mix_VolumeMusic(volume);
+    Mix_VolumeMusic(volume!=-1?volume:MIX_MAX_VOLUME);
 }
 
 void pausemusic() {
@@ -1014,7 +1016,8 @@ void resumemusic() {
 }
 
 void stopmusic() {
-    Mix_HaltMusic();
+    //Mix_HaltMusic();
+    Mix_FadeOutMusic(1000);
 }
 
 int loadsound(const char *filename) {
@@ -1034,7 +1037,7 @@ void freesound(int soundfile) {
 
 int playsound(int soundfile, const int volume) {
     const int channel = Mix_PlayChannel(-1, sounds[soundfile], 0);
-    if (volume!=-1) Mix_Volume(channel, volume);
+    Mix_Volume(channel, volume!=-1?volume:MIX_MAX_VOLUME);
     return channel;
 }