-Add emitterName for particles and make cleaner