diff --git a/app/src/main/java/de/patani/kettlebelltracker/MainActivity.kt b/app/src/main/java/de/patani/kettlebelltracker/MainActivity.kt
index cbf7bc5..a6a7080 100644
--- a/app/src/main/java/de/patani/kettlebelltracker/MainActivity.kt
+++ b/app/src/main/java/de/patani/kettlebelltracker/MainActivity.kt
@@ -24,6 +24,7 @@ import de.patani.kettlebelltracker.viewmodels.*
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import java.util.UUID
+import androidx.core.content.edit
 
 class MainActivity : ComponentActivity() {
 
@@ -47,7 +48,7 @@ class MainActivity : ComponentActivity() {
         var uuid = prefs.getString("app_uuid", null)
         if (uuid == null) {
             uuid = UUID.randomUUID().toString()
-            prefs.edit().putString("app_uuid", uuid).apply()
+            prefs.edit { putString("app_uuid", uuid) }
         }
         uuid
     }
@@ -72,11 +73,9 @@ class MainActivity : ComponentActivity() {
             override fun <T : ViewModel> create(modelClass: Class<T>): T {
                 return when {
                     modelClass.isAssignableFrom(TrainingViewModel::class.java) ->
-                        appUUID?.let {
-                            TrainingViewModel(db.trainingSessionDao(), settingsDataStore, apiRepository,
-                                it
-                            )
-                        } as T
+                        TrainingViewModel(db.trainingSessionDao(), settingsDataStore, apiRepository,
+                            appUUID
+                        ) as T
                     modelClass.isAssignableFrom(HomeViewModel::class.java) ->
                         HomeViewModel(db.trainingSessionDao(), trainingViewModel) as T
                     modelClass.isAssignableFrom(HistoryViewModel::class.java) ->
diff --git a/app/src/main/java/de/patani/kettlebelltracker/data/remote/ApiService.kt b/app/src/main/java/de/patani/kettlebelltracker/data/remote/ApiService.kt
index e6ad3d2..ff141cc 100644
--- a/app/src/main/java/de/patani/kettlebelltracker/data/remote/ApiService.kt
+++ b/app/src/main/java/de/patani/kettlebelltracker/data/remote/ApiService.kt
@@ -5,7 +5,7 @@ import retrofit2.http.Body
 import retrofit2.http.POST
 
 interface ApiService {
-    @POST("trainings/")
+    @POST("trainings")
     suspend fun sendTrainingData(@Body payload: TrainingPayload): Response<Unit>
 
     @POST("trainings/recommend-rest")
diff --git a/app/src/main/java/de/patani/kettlebelltracker/repositories/ApiRepository.kt b/app/src/main/java/de/patani/kettlebelltracker/repositories/ApiRepository.kt
index 949a2d8..d6f4768 100644
--- a/app/src/main/java/de/patani/kettlebelltracker/repositories/ApiRepository.kt
+++ b/app/src/main/java/de/patani/kettlebelltracker/repositories/ApiRepository.kt
@@ -25,7 +25,7 @@ class ApiRepository(private val apiService: ApiService) {
             )
             val response = apiService.sendTrainingData(payload)
             if (response.isSuccessful) {
-                Log.d("ApiRepository", "Training successfully sent to backend.")
+                Log.i("ApiRepository", "Training successfully sent to backend.")
             } else {
                 Log.e("ApiRepository", "API Error: Unexpected status code: ${response.code()}")
             }
@@ -39,6 +39,9 @@ class ApiRepository(private val apiService: ApiService) {
             val request = RestRecommendationRequest(uuid, repsPerSet, currentSets)
             val response = apiService.getRecommendedRest(request)
             if (response.isSuccessful) {
+                Log.i("ApiRepository", "Got Rest Recommendation:")
+                val body = response.body()?.data
+                Log.i("ApiRepository", body.toString())
                 response.body()?.data
             } else {
                 null
diff --git a/app/src/main/java/de/patani/kettlebelltracker/viewmodels/TrainingViewModel.kt b/app/src/main/java/de/patani/kettlebelltracker/viewmodels/TrainingViewModel.kt
index 543e42e..51aaf2e 100644
--- a/app/src/main/java/de/patani/kettlebelltracker/viewmodels/TrainingViewModel.kt
+++ b/app/src/main/java/de/patani/kettlebelltracker/viewmodels/TrainingViewModel.kt
@@ -30,7 +30,6 @@ data class TrainingState(
     val currentBlockDay: Int = 1,
     val currentReps: Int = 5,
     val totalTrainingDays: Int = 0,
-    // Neue Rundentimer-Eigenschaften
     val isRoundActive: Boolean = false,
     val currentRoundTime: Int = 0,
     val totalRoundTime: Int = 0
@@ -131,9 +130,7 @@ class TrainingViewModel(
 
         stopRoundTimer()
 
-        if (newSetsDone < currentState.goalSets) {
-            startNextRound()
-        }
+        startNextRound()
     }
 
     private fun startNextRound() {
@@ -208,6 +205,7 @@ class TrainingViewModel(
             )
 
             dao.insert(session)
+            Log.d("Training", "Sending Trainingsession to backend: $appUUID")
             apiRepository.sendTrainingData(session, appUUID)
             resetTraining()
         }