Fixed comment header when only plugins have comment - Issue  #Num: #16
Fixed issue where notification emails would fail #Num: #17