more emitter changes to support vectors