Fixed incorrect superclass order (due to a braino).
Included additional classes in phase 2 of the boot process.