More bootstrapping and some minor bug fixes