diff --git a/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java b/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java
index 1e47552..dba46e0 100644
--- a/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java
+++ b/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java
@@ -717,6 +717,7 @@ public class MainWindowController {
 				// check if there is a series node to add the item
 				for (int i = 0; i < filmRoot.getChildren().size(); i++) {
 					if (filmRoot.getChildren().get(i).getValue().getTitle().equals(element.getTitle())) {
+						// if a root node exists, add element as child
 //						System.out.println("Found a root node to add child");
 //						System.out.println("Adding: " + element.getStreamUrl());
 						TreeItem<FilmTabelDataType> episodeNode = new TreeItem<>(new FilmTabelDataType(element.getStreamUrl(),
@@ -724,8 +725,10 @@ public class MainWindowController {
 								element.getCached(), element.getImage()));
 						filmRoot.getChildren().get(i).getChildren().add(episodeNode);
 					} else if (i == filmRoot.getChildren().size() - 1) {
+						// if no root node exists, create one and add element as child
 //						System.out.println("Create a root node to add child");
 //						System.out.println("Adding: " + element.getStreamUrl());
+						// TODO get the last watched episode, the first one with currentTime != 0
 						TreeItem<FilmTabelDataType> seriesRootNode = new TreeItem<>(new FilmTabelDataType(element.getStreamUrl(),
 								element.getTitle(), "", "", element.getFavorite(), element.getCached(), element.getImage()));
 						filmRoot.getChildren().add(seriesRootNode);
diff --git a/src/main/java/kellerkinder/HomeFlix/controller/DBController.java b/src/main/java/kellerkinder/HomeFlix/controller/DBController.java
index 07386b5..803dec9 100644
--- a/src/main/java/kellerkinder/HomeFlix/controller/DBController.java
+++ b/src/main/java/kellerkinder/HomeFlix/controller/DBController.java
@@ -236,7 +236,7 @@ public class DBController {
 	}
 	
 	/**
-	 * refresh data in mainWindowController localFilms and streamingFilms
+	 * refresh data in mainWindowController for one element
 	 * @param streamUrl of the film
 	 * @param index of the film in LocalFilms list
 	 */
diff --git a/src/main/java/kellerkinder/HomeFlix/player/PlayerController.java b/src/main/java/kellerkinder/HomeFlix/player/PlayerController.java
index b2c250a..e15ad32 100644
--- a/src/main/java/kellerkinder/HomeFlix/player/PlayerController.java
+++ b/src/main/java/kellerkinder/HomeFlix/player/PlayerController.java
@@ -144,13 +144,15 @@ public class PlayerController {
 		    		dbController.setCurrentTime(film.getStreamUrl(), 0); // reset old video start time
 		    		
 		    		//start the new film
-		    		System.out.println("next episode is: " + dbController.getNextEpisode(film.getTitle(), episode + 1));
-		    		mediaPlayer.stop();
-		    		player.playNewFilm(dbController.getNextEpisode(film.getTitle(), episode + 1));		
+		    		FilmTabelDataType nextFilm = dbController.getNextEpisode(film.getTitle(), episode + 1);
+		    		if (nextFilm != null) {
+//		    			System.out.println("next episode is: " + nextFilm.getStreamUrl());
+			    		mediaPlayer.stop();
+			    		player.playNewFilm(nextFilm);
+			    		autoplay = true;
+					}
 				} else if ((duration - currentTime) < 100) {
-					dbController.setCurrentTime(film.getStreamUrl(), 0);
 					mediaPlayer.stop();
-					player.getStage().close();
 				}
 
 		    	if (!mousePressed) {