refactor bootstrap config
small fixes