diff --git a/Customizing/global/plugins/Services/Repository/RepositoryObject/ReportStudyProgramme/classes/class.ilObjReportStudyProgrammeGUI.php b/Customizing/global/plugins/Services/Repository/RepositoryObject/ReportStudyProgramme/classes/class.ilObjReportStudyProgrammeGUI.php
index 2265f78aafe4..62052803c774 100644
--- a/Customizing/global/plugins/Services/Repository/RepositoryObject/ReportStudyProgramme/classes/class.ilObjReportStudyProgrammeGUI.php
+++ b/Customizing/global/plugins/Services/Repository/RepositoryObject/ReportStudyProgramme/classes/class.ilObjReportStudyProgrammeGUI.php
@@ -123,7 +123,10 @@ public function showContent()
 
 			require_once("Modules/StudyProgramme/classes/class.ilObjectFactoryWrapper.php");
 			$sp = \ilObjectFactoryWrapper::getInstanceByRefId($settings->getSPNodeRefId());
+			// TODO: Use most recent assignment, not the first that accidentially is in the list.
 			$assignments = $sp->getAssignmentsOf($this->g_user->getId());
+			// TODO: Check if there are actually assignments and print an error message if
+			// none could be found.
 			$assignment = $assignments[0];
 
 			require_once("Modules/StudyProgramme/classes/tables/class.ilIndividualPlanGUI.php");
diff --git a/Customizing/global/plugins/Services/Repository/RepositoryObject/ReportStudyProgramme/lang/ilias_de.lang b/Customizing/global/plugins/Services/Repository/RepositoryObject/ReportStudyProgramme/lang/ilias_de.lang
new file mode 100644
index 000000000000..1f066a68ef0f
--- /dev/null
+++ b/Customizing/global/plugins/Services/Repository/RepositoryObject/ReportStudyProgramme/lang/ilias_de.lang
@@ -0,0 +1,23 @@
+<!-- language file start -->
+obj_xsp#:#Studienprogrammreport
+objs_xsp#:#Studienprogrammreports
+obj_xsp_duplicate#:#Studienprogrammreport kopieren
+objs_xsp_duplicate#:#Studienprogrammreports kopieren
+obj_xsp_select#:#Studienprogrammreport auswählen
+xsp_add#:#Studienprogrammreport hinzufügen
+xsp_new#:#Neuen Studienprogrammreport hinzufügen
+xsp_read#:#Lesezugriff zum Studienprogrammreport
+xsp_write#:#Studienprogrammreport bearbeiten
+xsp_delete#:#Studienprogrammreport löschen
+xsp_visible#:#sichtbar
+xsp_edit_permission#:#schreibberechtigt
+crs_create_xsp#:#Studienprogrammreport erzeugen
+grp_create_xsp#:#Studienprogrammreport erzeugen
+fold_create_xsp#:#Studienprogrammreport erzeugen
+root_create_xsp#:#Studienprogrammreport erzeugen
+cat_create_xsp#:#Studienprogrammreport erzeugen
+rep_robj_xsp_status#:#Status
+online#:#Online
+rep_robj_xsp_offline#:#Offline
+xsp_content#:#Report
+xsp_properties#:#Eigenschaften
diff --git a/Customizing/global/plugins/Services/Repository/RepositoryObject/ReportStudyProgramme/plugin.php b/Customizing/global/plugins/Services/Repository/RepositoryObject/ReportStudyProgramme/plugin.php
index f8d9872e2ab1..8ce0165137af 100644
--- a/Customizing/global/plugins/Services/Repository/RepositoryObject/ReportStudyProgramme/plugin.php
+++ b/Customizing/global/plugins/Services/Repository/RepositoryObject/ReportStudyProgramme/plugin.php
@@ -2,7 +2,7 @@
 
 $id = "xsp";
 
-$version = "0.1.1";
+$version = "0.2.1";
 
 $ilias_min_version = "4.2.0";
 $ilias_max_version = "5.0.0";
diff --git a/Modules/StudyProgramme/classes/tables/class.ilIndividualPlanGUI.php b/Modules/StudyProgramme/classes/tables/class.ilIndividualPlanGUI.php
index baf5b21b8415..56b6be8cce27 100644
--- a/Modules/StudyProgramme/classes/tables/class.ilIndividualPlanGUI.php
+++ b/Modules/StudyProgramme/classes/tables/class.ilIndividualPlanGUI.php
@@ -7,6 +7,8 @@
  *
  * @author Stefan Hecken 	<stefan.hecken@concepts-and-training.de>
  */
+// TODO: rename gev_va_* lang variables here (and on other files in this folder) to prg_* variables.
+// TODO: check if all lang_vars are defined in global lang/ilias_de.lang
 class ilIndividualPlanGUI
 {
 
@@ -30,6 +32,8 @@ class ilIndividualPlanGUI
 	 */
 	protected $isPost;
 
+	// TODO: Pass required attributes (i.e. assignment id and sp_ref_id) as args here.
+	// TODO: declare all attributes as docstrings.
 	public function __construct()
 	{
 		global $ilCtrl, $tpl;
@@ -258,6 +262,7 @@ protected function findAssignmentId()
 		}
 	}
 
+	// TODO: Remove this. The user could unambigously be retreived from the assignment.
 	public function setUserId($user_id)
 	{
 		$this->user_id = $user_id;
diff --git a/setup/sql/dbupdate_custom.php b/setup/sql/dbupdate_custom.php
index 9e22d167a8ec..ad2649a2a8d3 100755
--- a/setup/sql/dbupdate_custom.php
+++ b/setup/sql/dbupdate_custom.php
@@ -5226,7 +5226,7 @@
 
 <#230>
 <?php
-
+;
 ?>
 
 <#231>