Fix several minor bugs
Merge branch 'Präsentation' of https://github.com/v02460/ctt into Präsentation