begin bootstrapping, tons of bugfixes