update bootstrap, assorted cleanup