fixes & workarounds
renaming
noise factory started