Model setup: add barriers to environment constructor
Model setup: convert environment to use opts/defaultOpts syntax

Doesn't change environment setup, but makes code easier to
read (hopefully?) as we add more options to the environment
constructor.
Model setup: add wrapping to constructor