Updated plotting and case scripts