Improved emitter + fixes.