Some plotting and run changes