simulation contexts - Update of #568

addresses most comments.