Updates to make the setup a bit more reliable.
Add some extra documentation on how to use this.