added unified bootstrapping
minor refactoring