lots of cleanup. update bootstrap.