Gardening

Merged Bengfort requested to merge gardening into master

Fixed some broken code. Not sure if the interpretations was correct everywhere.

Merge request reports