update bootstrap & minor fixes