More code updates.
Code cleanup.
Changed the way the options for a plugin are specified.