Make tools stuff nicer

Oliver Falk requested to merge tools into master

Merge request reports