emitter tweak as upstream, docs update on differences with prime.