minor changes
merge
added curve emitter