Added some things to make it easier to replicate the environment