Fallbeispiel chapter and some overall changes