Freeflow/some improvements

Merged Thomas Fetzer requested to merge freeflow/someImprovements into master

Merge request reports