Update key names.
Width check and more precise FWHM conversion.