clean up plot
merge upstream