Tweaks to emitter tool