randoriemitter code tweaks