diff --git a/_includes/semester.html b/_includes/semester.html
index 490cb51aa44d13f7b3f1305bfee9369ec597a9ef..c3095c48f14b94e27f314db18666b5ca69e20e74 100644
--- a/_includes/semester.html
+++ b/_includes/semester.html
@@ -2,14 +2,37 @@
     Renders the name of a single semester. Expects 'semester' as a parameter. 
 {% endcomment %}
 
+<!-- check if we are a summer semester -->
 {% assign nosummer = semester | remove: "SS" %}
-{% assign semesteryear = nosummer | remove: "WS" %}
+{% unless nosummer == semester %}
+    Summer
+{% endunless %}
 
-<!-- string.contains doesn't work, neither does substring -->
-{% if nosummer == semester  %}
+<!-- check if we are a winter semester -->
+{% assign nowinter = semester | remove: "WS" %}
+{% unless nowinter == semester %}
     Winter
-{% else %}
-    Summer
-{% endif %}
+{% endunless %}
+
+<!-- check if we are a fall semester -->
+{% assign nofall = semester | remove: "Fall" %}
+{% unless nofall == semester %}
+    Fall
+{% endunless %}
+
+<!-- check if we are a spring semester -->
+{% assign nospring = semester | remove: "Spring" %}
+{% unless nospring == semester %}
+    Spring
+{% endunless %}
+
+<!-- check if we are an intersession semester -->
+{% assign nointer = semester | remove: "Intersession" %}
+{% unless nointer == semester %}
+    Intersession
+{% endunless %}
+
+<!--  find the year only -->
+{% assign semesteryear = nosummer | remove: "WS" | remove: "SS" | remove: "Fall" | remove: "Spring" | remove: "Intersession" %}
 
 20{{semesteryear}}
\ No newline at end of file
diff --git a/_layouts/course.html b/_layouts/course.html
index d594acbc296ce4dc07d5cc807c51f2b180b34fb9..4bf030a9c5651dd673d6f471bdca96671126acce 100644
--- a/_layouts/course.html
+++ b/_layouts/course.html
@@ -7,11 +7,15 @@ layout: default
     <div class="card">
       <div class="card-content">
         <span class="card-title">{{page.title}}</span>
-        
-        {% assign person = page.instructor %}
-        {% include people_chip.html %}
+        {% for person in page.instructors %}
+            {% include people_chip.html %}<br />
+        {% endfor %}        
         <hr />
         
+        {% if page.organization %}
+            <b>{{page.organization}}</b> <br />
+        {% endif %}
+        
         {% for semester in page.semesters %}
             {% include semester.html %}<br />
         {% endfor %}
diff --git a/courses/AIProj.md b/courses/AIProj.md
index 3bf756ea3ea7895e9a88d1749fb974e30ca0dfad..db973a7a352904945df2f7b245563c8e10191901 100644
--- a/courses/AIProj.md
+++ b/courses/AIProj.md
@@ -2,8 +2,8 @@
 layout: course
 
 title: Projekt zur Künstlichen Intelligenz
-instructor:
-  - mkohlhase
+instructors:
+    - mkohlhase
 
 semesters: 
     - WS17/18
diff --git a/courses/GenICT1.md b/courses/GenICT1.md
index 90bbc84fc3ecd7effc377f9037dabf98d4d281bf..4fb591876da28c65fd097fe85b11ccdac9376873 100644
--- a/courses/GenICT1.md
+++ b/courses/GenICT1.md
@@ -2,15 +2,15 @@
 layout: course
 
 title: General Information and Communication Technology I 
-instructor:
-- mkohlhase
-- Prof.  Jürgen Schönwälder
-- Prof. Peter Baumann
-- Prof. Herbert Jaeger
+instructors:
+    - mkohlhase
+    - Prof.  Jürgen Schönwälder
+    - Prof. Peter Baumann
+    - Prof. Herbert Jaeger
     
 organization: Jacobs University
 semesters:
-- Fall14
-- Fall15
+    - Fall14
+    - Fall15
 ---
 An Introduction to Computer Science for students of all subjects. 
diff --git a/courses/GenICT2.md b/courses/GenICT2.md
index 5e6e3b67a2521fcf6526090fd26837f5fc75c105..09e5437ddc49018cac964a6558f41ef477b6abbf 100644
--- a/courses/GenICT2.md
+++ b/courses/GenICT2.md
@@ -2,14 +2,14 @@
 layout: course
 
 title: General Information and Communication Technology II 
-instructor:
-- mkohlhase
-- Prof.  Jürgen Schönwälder
-- Prof. Peter Baumann
-- Prof. Herbert Jaeger
-    
+instructors:
+    - mkohlhase
+    - Prof.  Jürgen Schönwälder
+    - Prof. Peter Baumann
+    - Prof. Herbert Jaeger
+
 organization: Jacobs University
 semesters:
-- Spring15
+    - Spring15
 ---
 An Introduction to Computer Science for students of all subjects. 
diff --git a/courses/KRMT.md b/courses/KRMT.md
index 82df600725973d51a471b7af8d8d525a0d7d9cb9..b8d682b777811793e136c7f377bce6541c23e86a 100644
--- a/courses/KRMT.md
+++ b/courses/KRMT.md
@@ -2,8 +2,8 @@
 layout: course
 
 title: Logik-Basierte Wissensrepräsentation für Mathematisch/Technisches Wissen
-instructor:
-    - omkohlhase
+instructors:
+    - mkohlhase
 
 semesters:
     - SS17
diff --git a/courses/ai.md b/courses/ai.md
index ce07f6b1ca515a89d85c2058e73f3541c7383b38..12a128a5e17d5f4668eb064e1d713046082c6fad 100644
--- a/courses/ai.md
+++ b/courses/ai.md
@@ -2,7 +2,7 @@
 layout: course
 
 title: Artificial Intelligence
-instructor:
+instructors:
     - mkohlhase
 
 organization: Jacobs University
diff --git a/courses/ai1.md b/courses/ai1.md
index b3e41253665a4527597cc9cac13fabb020f6fe27..c54ea4daabf166e2d13a79ec25ad3c9099072cc0 100644
--- a/courses/ai1.md
+++ b/courses/ai1.md
@@ -2,7 +2,7 @@
 layout: course
 
 title: Künstliche Intelligenz I
-instructor:
+instructors:
     - mkohlhase
 
 semesters:
diff --git a/courses/ai2.md b/courses/ai2.md
index 7bf7ebdd49ef68170f7d845007e5105b8ed20c33..8e3192a5b50a9bb884ccdc5c0f0d3fe79ebf19d6 100644
--- a/courses/ai2.md
+++ b/courses/ai2.md
@@ -2,8 +2,8 @@
 layout: course
 
 title: Künstliche Intelligenz II
-instructor:
-  - mkohlhase
+instructors:
+    - mkohlhase
 
 semesters:
     - SS17
diff --git a/courses/complog.md b/courses/complog.md
index 0cdfb89dbf6efbbccd2eadbe094bad71a579d42e..3a7b139a2e247abf81e543f5787163589ca0b88c 100644
--- a/courses/complog.md
+++ b/courses/complog.md
@@ -2,8 +2,8 @@
 layout: course
 
 title: Computational Logic
-instructor:
-  - mkohlhase
+instructors:
+    - mkohlhase
     - frabe
     - dmueller
     
diff --git a/courses/comsem.md b/courses/comsem.md
index 6d122e0afcbaf402ce10106b682e7231bb500d03..0856695a7d350f1e140512b93baf5f6f80bf53c4 100644
--- a/courses/comsem.md
+++ b/courses/comsem.md
@@ -2,8 +2,8 @@
 layout: course
 
 title: Computational Natural Language Semantics
-instructor:
-  - mkohlhase
+instructors:
+    - mkohlhase
     
 organization: Jacobs University
 semesters:
diff --git a/courses/dbwa.md b/courses/dbwa.md
index 914c28ffb751bdc703316754edffe4cc121d4df7..698f239ba374675d0fd2be4e0e7af4693e30b9c0 100644
--- a/courses/dbwa.md
+++ b/courses/dbwa.md
@@ -2,8 +2,8 @@
 layout: course
 
 title: Data Bases and Web Applications
-instructor:
-  - mkohlhase
+instructors:
+    - mkohlhase
 
 organization: Jacobs University
 semesters:
diff --git a/courses/dynamics.md b/courses/dynamics.md
index de9437c798acd110c9adf02dccfe50bfa31bdf36..baf54328f5dba29a4e6a1d9e633df3c93c0a5aa7 100644
--- a/courses/dynamics.md
+++ b/courses/dynamics.md
@@ -2,9 +2,9 @@
 layout: course
 
 title: Representing Dynamics and Dynamic Representation 
-instructor:
-  - mkohlhase
-    - Herber Jaeger, Jacocbs University
+instructors:
+    - mkohlhase
+    - Herber Jaeger, Jacobs University
 
 organization: Jacobs University
 semesters:
diff --git a/courses/gencs.md b/courses/gencs.md
index 879c138d890462645e7b893cbbbc0b3c52077870..96595932bbda5938f69f177a86d70e58e7fbc7a1 100644
--- a/courses/gencs.md
+++ b/courses/gencs.md
@@ -2,13 +2,13 @@
 layout: course
 
 title: General Computer Science
-instructor:
-  - mkohlhase
+instructors:
+    - mkohlhase
 
 organization: Jacobs University
 semesters:
-    - Fall015 
-    - Fall016 
+    - Fall15 
+    - Fall16 
 ---
 
 General Computer Science I is the first semester, introductory course taught at Jacobs University. Starting the Fall Semester 2015 (when GenCS II was dropped). It is really still the same as GenCS I. 
diff --git a/courses/gencs1.md b/courses/gencs1.md
index 4409046b4bd2fa7ce02451d0351009ba6a931387..f383d67326bb48900d0e41997bfa1bdd85e139d5 100644
--- a/courses/gencs1.md
+++ b/courses/gencs1.md
@@ -2,8 +2,8 @@
 layout: course
 
 title: General Computer Science I
-instructor:
-  - mkohlhase
+instructors:
+    - mkohlhase
 
 organization: Jacobs University
 semesters:
@@ -14,11 +14,11 @@ semesters:
     - Fall07
     - Fall08
     - Fall09
-    - Fall010
-    - Fall011
-    - Fall012
-    - Fall013 
-    - Fall014 
----p
+    - Fall10
+    - Fall11
+    - Fall12
+    - Fall13 
+    - Fall14 
+---
 
 General Computer Science I is the first semester, introductory course taught at Jacobs University. It focuses on representation issues for objects, and uses SML as an programming language to equalize over a diverse student body. 
diff --git a/courses/gencs2.md b/courses/gencs2.md
index b549737a0b09f32817ad191cce0ed593c0b04ad3..1b6a5425530968f3d0d21ec673416792dbc4dd01 100644
--- a/courses/gencs2.md
+++ b/courses/gencs2.md
@@ -2,8 +2,8 @@
 layout: course
 
 title: General Computer Science II
-instructor:
-  - mkohlhase
+instructors:
+    - mkohlhase
 
 organization: Jacobs University
 semesters:
diff --git a/courses/krsw.md b/courses/krsw.md
index a5f5ce8f361e41b8ad3f2dec47ae7e26aa582043..f531d401697deb7083fc504a93bee2adb2d50f76 100644
--- a/courses/krsw.md
+++ b/courses/krsw.md
@@ -2,8 +2,8 @@
 layout: course
 
 title: Research Seminar -  Knowledge Representation and Semantic Web
-instructor:
-  - mkohlhase
+instructors:
+    - mkohlhase
     - frabe
 
 organization: Jacobs University
diff --git a/courses/lbs.md b/courses/lbs.md
index 5a42c472d582c1f94a97b0e33ccb6de635bca6ef..c15ebc93b034065d60c0beea2f07fc6cec6df3ba 100644
--- a/courses/lbs.md
+++ b/courses/lbs.md
@@ -2,8 +2,8 @@
 layout: course
 
 title: Logik-Basierte Sprachverarbeitung (LBS)
-instructor:
-  - mkohlhase
+instructors:
+    - mkohlhase
 
 semesters:
     - WS17/18
diff --git a/courses/meta/README.md b/courses/meta/README.md
index daf67be2d1eafead4f46b05309378ca862d8d6fa..c4923bf850c6a139f325f8a3290ae117c799b2e1 100644
--- a/courses/meta/README.md
+++ b/courses/meta/README.md
@@ -9,8 +9,9 @@ Each file  needs some specific parameters:
  * **layout** use *course* 
 
  * **title** the title of the course/seminar
- * **instructor** instructor of the course
+ * **instructors** instructor(s) of the course
 
+* **organization** (optional) organization in which the course was taught
  * **semesters** semesters in which the course was taught
  
 A semester is automatically regarded as active if the current semester matches one of the one in which the course was offered. 
\ No newline at end of file
diff --git a/courses/meta/upcoming.md b/courses/meta/upcoming.md
index 193ad34ee93c384fe050915eef653e2ea2cf45cc..2b025744d60e8238c07bbbe8b7b165a4e738644b 100644
--- a/courses/meta/upcoming.md
+++ b/courses/meta/upcoming.md
@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Upcoming ({% site.upcoming %})
+title: Upcoming Courses
 permalink: /courses/upcoming/
 ---
 
diff --git a/courses/tdm.md b/courses/tdm.md
index 27fe692f0bc2dc98f492f4a2465d8ea01bb78ae4..6cee66e1e09921ad0d3d9d6770f4b855833cfd0b 100644
--- a/courses/tdm.md
+++ b/courses/tdm.md
@@ -2,7 +2,7 @@
 layout: course
 
 title: "University Study Course: Text and Digital Media"
-instructor:
+instructors:
     - mkohlhase
     - Prof. Thomas Rommel, Jacobs University
 
diff --git a/courses/ttt.md b/courses/ttt.md
index 80534176a8a7b363f90c43e3293dbe7fe92c250f..a8fa08668e3e4e6ad002071584b37fb50e98faa5 100644
--- a/courses/ttt.md
+++ b/courses/ttt.md
@@ -2,13 +2,13 @@
 layout: course
 
 title: "University Study Course - From the Textual to the Technological: Documents and Structure in a Digital Age"
-instructor:
+instructors:
     - mkohlhase
     - Dr. Giselda Baudin 
 
 organization: Jacobs University
 semesters:
-    - Intersession 2014
+    - Intersession14
 ---
 An interdisciplinary Introduction to the structure and management of Text and Digial
 Media.
diff --git a/courses/wuv.md b/courses/wuv.md
index da72a1790d374e09b7c98e73d1cf92e38459abdd..a150a1b9de31cb1777d97d6e3087f2942cbaf028 100644
--- a/courses/wuv.md
+++ b/courses/wuv.md
@@ -2,8 +2,8 @@
 layout: course
 
 title: Seminar Wissensrepräsentation und -verarbeitung
-instructor:
-  - mkohlhase
+instructors:
+    - mkohlhase
 
 semesters:
     - SS17