Made compatible with diracsolver, scatter plots added.