update bootstrap. clean up