more new environment model work
a few more things in the new environment