more simulator tweaks