several adjustments related to my master thesis for review
@kaussow please review and if fine merge 😄