minor fixes - PlotAtoms still doesn't work properly, I think it's related to the duplication procedure. Still working on a fix