Removed particle emitter, some updates