More additions to bootstrap