bootstraps and small changes