Updated plotting and examples