more simulation fixes