Added plotting and analysis tools