Bootstrapper updates

* Fixed the environment checks to work properly.
* Updated comments.