More state fixes. Now simulation does not hang in Icarus. There was a loop.