ExerciseController.cs + some minor changes