Boostrapper: install use the mode arg
A few improvements to the bootstrapper