diff --git a/new-player/src/main/java/net/newpipe/newplayer/logic/ConstraintStreamSelector.kt b/new-player/src/main/java/net/newpipe/newplayer/logic/ConstraintStreamSelector.kt
index ac2e3e0..cd7d153 100644
--- a/new-player/src/main/java/net/newpipe/newplayer/logic/ConstraintStreamSelector.kt
+++ b/new-player/src/main/java/net/newpipe/newplayer/logic/ConstraintStreamSelector.kt
@@ -6,6 +6,8 @@ import net.newpipe.newplayer.data.StreamTrack
 
 /**
  * TODO
+ * This selector should be used if the uses did pic a specific language and/or a specific
+ * video resolution.
  */
 internal object ConstraintStreamSelector {
     fun selectStream(
diff --git a/new-player/src/main/java/net/newpipe/newplayer/logic/StreamExceptionResponse.kt b/new-player/src/main/java/net/newpipe/newplayer/logic/StreamExceptionResponse.kt
index 4f7c6d5..9930800 100644
--- a/new-player/src/main/java/net/newpipe/newplayer/logic/StreamExceptionResponse.kt
+++ b/new-player/src/main/java/net/newpipe/newplayer/logic/StreamExceptionResponse.kt
@@ -21,14 +21,41 @@
 package net.newpipe.newplayer.logic;
 
 import net.newpipe.newplayer.data.StreamSelection
+import net.newpipe.newplayer.NewPlayer
 
 interface StreamExceptionResponse
 
+/***
+ * Perform a specific action, like halting the playback or etc.
+ */
 data class ActionResponse(val action: () -> Unit) : StreamExceptionResponse
 
+/**
+ * Tell NewPlayer with which stream selection of the current item the currently failing stream
+ * selection should be replaced with. This can be used if only individual streams or tracks
+ * corresponding to one item fail.
+ *
+ * If you want to reload the current item due to a timeout issue, or you want to replace the current
+ * item all together, you should instead respond with [ReplaceItemResponse].
+ */
 data class ReplaceStreamSelectionResponse(val streamSelection: StreamSelection) :
     StreamExceptionResponse
 
+/**
+ * Tell NewPlayer with which item the currently failing item should be replaced with.
+ * NewPlayer will continue to playback the new item at the position the last item failed.
+ * The mew item will also be inserted in the same playlist position as the failing item was.
+ *
+ * This can also be used to just reload the currently failing item. Just supply the same item as
+ * the currently failing item. NewPlayer will call the repository and ask for new streams for that
+ * item. This can be used if stream urls get deprecated due to a timeout.
+ *
+ * If you don't want the whole item to be replaced/reloaded you should instead respond with a
+ * [ReplaceStreamSelectionResponse].
+ */
 data class ReplaceItemResponse(val newItem: String) : StreamExceptionResponse
 
+/**
+ * Don't do anything to recover from the fail and forward the exception to [NewPlayer.errorFlow]
+ */
 class NoResponse : StreamExceptionResponse