Various improvements

Florian Schmaus requested to merge flow/emper:various-improvements into master

Merge request reports