Added report text. Some other refactoring.