Changes again to package, especially in plotting and depends.