Add additional addons to load (via plugins). Fix some minor bugs.