Byu/plot

various fixes