fixes
simulation structure review