update and fix bootstrap