parms cleanup and new emitter settings
merge