diff --git a/src/beatboxer/BeatBoxer.java b/src/beatboxer/BeatBoxer.java
index 41d7d50..594fb9e 100644
--- a/src/beatboxer/BeatBoxer.java
+++ b/src/beatboxer/BeatBoxer.java
@@ -17,6 +17,7 @@
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
+import javafx.scene.image.Image;
 import javafx.scene.media.*;
 import javafx.stage.DirectoryChooser;
 import javafx.stage.Stage;
@@ -43,10 +44,10 @@ public void start(Stage stage) throws Exception {
         mediaPlayer = toMediaPlayer(nowPlaying.get(0));
         Parent root = FXMLLoader.load(getClass().getResource("BeatBoxer.fxml"));
         Scene scene = new Scene(root);
-        
         scene.getStylesheets().add(getClass().getResource("stylesheet.css").toExternalForm());
         stage.setScene(scene);
         stage.setTitle("BeatBoxer");
+        stage.getIcons().add(new Image(BeatBoxer.class.getResourceAsStream( "images/BeatBoxer.png" ))); 
         stage.show();
 //        mediaPlayer.play();
         state.addListener(new ChangeListener<String>(){
diff --git a/src/beatboxer/BeatBoxerController.java b/src/beatboxer/BeatBoxerController.java
index 7c8b5d2..0044964 100644
--- a/src/beatboxer/BeatBoxerController.java
+++ b/src/beatboxer/BeatBoxerController.java
@@ -613,6 +613,14 @@ public void changed(
                             //                            bb.mediaPlayer.dispose();
 //                                if(BeatBoxer.autoPlay){
                             BeatBoxer.state.setValue("autoPlayNext");
+                            if(BeatBoxer.currentIndex==BeatBoxer.nowPlaying.size()-1){
+                                BBSong song = (BeatBoxer.nowPlaying.get(0));
+                                setVolumeValue(song.getGenre());
+                        }
+                        else{
+                            BBSong song = (BeatBoxer.nowPlaying.get(BeatBoxer.currentIndex+1));
+                                setVolumeValue(song.getGenre());
+                        }
                             //                                BeatBoxer.play();
 //                                }
 //                                else
diff --git a/src/beatboxer/TimerController.java b/src/beatboxer/TimerController.java
index b465d44..dba755e 100644
--- a/src/beatboxer/TimerController.java
+++ b/src/beatboxer/TimerController.java
@@ -70,10 +70,10 @@ public void changed(ObservableValue<? extends Boolean> observable, Boolean oldVa
             @Override
             public void changed(ObservableValue<? extends Number> observable, Number oldValue, Number newValue) {
                 if(newValue.intValue()<1 && minuteSlider.getValue()<1){
-                    ok.setDisable(true);
+                        ok.setDisable(true);
                 }
                 else if(newValue.intValue()>=1){
-                    ok.setDisable(false);
+                        ok.setDisable(false);
                 }
             }
             
@@ -82,16 +82,17 @@ else if(newValue.intValue()>=1){
             @Override
             public void changed(ObservableValue<? extends Number> observable, Number oldValue, Number newValue) {
                 if(newValue.intValue()<1 && secondSlider.getValue()<1){
-                    ok.setDisable(true);
+                        ok.setDisable(true);
                 }
                 else if(newValue.intValue()>=1){
-                    ok.setDisable(false);
+                        ok.setDisable(false);
                 }
             }
             
         });
         if(BeatBoxer.timer!=null){
             stop.setDisable(false);
+            try{
             BeatBoxer.timer.currentTimeProperty().addListener(new ChangeListener<Duration>(){
                 @Override
                 public void changed(ObservableValue<? extends Duration> observable, Duration oldValue, Duration newValue) {
@@ -104,6 +105,10 @@ public void changed(ObservableValue<? extends Duration> observable, Duration old
                     }
                 }
             });
+            }
+            catch (NullPointerException e){
+                ;
+            }
         }
         else
             stop.setDisable(true);
diff --git a/src/beatboxer/images/BeatBoxer.png b/src/beatboxer/images/BeatBoxer.png
new file mode 100644
index 0000000..40530d2
Binary files /dev/null and b/src/beatboxer/images/BeatBoxer.png differ
diff --git a/src/beatboxer/images/BeatBoxer.psd b/src/beatboxer/images/BeatBoxer.psd
new file mode 100644
index 0000000..5a1d25c
Binary files /dev/null and b/src/beatboxer/images/BeatBoxer.psd differ