sfx manager refactoring
misc refactoring