noisefactory3/4, fixes