Add smoothing. Plotting now faulty
Fix plotting