fix: Fallunterscheidung
+ add issue #7
+ minor fixes