Added plugin report, but still some minute fixes needed