added new plots for funding and category, along with some cleanup