Did some minor things, mostly saving so that refactoring doesn't screw stuff up.
bunch of cosmetic changes and adding support for multiple plots.