Update bootstrap and instructions to be more complete