Add reports + bugfix