Bootstrapification and bugfixing continued