refine and refactor. update bootstrap.