Plotting updates and cleanup (includes fixing typo in AnalysisDB field name)