AccountingPlot dev; core fixes