more tweaks to bootstrapping
more tweaks