some small updates to emulation