Add plotlist
Fix minor bug