Clean-up to make readable.
Added error estimation to non-parametric fit. Fixed FWHM error in gaussian fitting.