Fixed up plugin system.
Fixing up plugins pt deux