Plugins are now loaded earlier. Other minor tweaks.