add bootstrapping support
bugfixes