Integrate and test Enapps mods, and other changes.