tweaks to simulator