~ more refactoring of plotting libraries, variables