The general bootstrap should be OK

Only some small bugfixes and checks need to be addressed