bootstrap.rb expansion and fixing