simulation updates and other fixes