add facts back into MPU, and a few fixups