simulator fixes
merge