Updated some trace plotting functions