diff --git a/README.md b/README.md
index 348fcc55f..cf42dc5da 100644
--- a/README.md
+++ b/README.md
@@ -101,7 +101,7 @@ psql -U uniworx -d uniworx -h 127.0.0.1 -w
 \dt
 
 --Zeige Tabellen Inhalt:
-TABEL "user";
+TABLE "user";
 -- Die Anführungszeichen können manchmal weggelassen werden, aber
 -- bei user sind sie notwendig, da es auch Schlüsselwort in sql ist.
 
diff --git a/models b/models
index ea24256b9..f56b467b2 100644
--- a/models
+++ b/models
@@ -44,15 +44,11 @@ School json
     shorthand     Text
     UniqueSchool name
     deriving Eq    
-Degree json
-    name Text
-    schoolId SchoolId
-    UniqueDegree name schoolId
-    deriving Eq    
 DegreeCourse json
-    degreeId DegreeId
-    courseId CourseId
-    UniqueDegreeCourse degreeId courseId
+    course       CourseId
+    degree       StudyDegreeId
+    terms        StudyTermsId
+    UniqueDegreeCourse course degree terms
 Course 
     name         Text
     description  Html Maybe
@@ -69,6 +65,10 @@ CourseEdit
     user         UserId
     time         UTCTime
     course       CourseId
+CourseFavourite
+    user         UserId
+    time         UTCTime
+    course       CourseId
 Lecturer 
     userId       UserId
     courseId     CourseId
@@ -154,7 +154,7 @@ SubmissionGroupUser
 Tutorial json
     name        Text
     tutor       UserId    
-    course      CourseId -- ?
+    course      CourseId
 TutorialUser
     userId      UserId
     tutorialId  TutorialId
@@ -185,6 +185,7 @@ Room
     tutorialId  TutorialId
     examId      ExamId
 -- data RoomFor = RoomForCourseIdSum CourseId | RoomForTutorialIdSum TutorialId ...
+-- EXAMS ARE TODO:
 Exam
     courseId            CourseId
     name                Text
@@ -196,13 +197,13 @@ Exam
     deregistrationEnd   UTCTime
     ratingVisible       Bool
     statisticsVisible   Bool
-ExamEdit
-    user                UserId
-    time                UTCTime
-    exam                ExamId
-ExamUser
-    userId              UserId
-    examId              ExamId
-    -- CONTINUE HERE: Include rating in this table or separately?
-    UniqueExamUser userId examId
- -- By default this file is used in Model.hs (which is imported by Foundation.hs)
+--ExamEdit
+--    user                UserId
+--    time                UTCTime
+--    exam                ExamId
+--ExamUser
+--    userId              UserId
+--    examId              ExamId
+--    -- CONTINUE HERE: Include rating in this table or separately?
+--    UniqueExamUser userId examId
+-- By default this file is used in Model.hs (which is imported by Foundation.hs)