updating bootstrap
various small fixes