Added PluginInfo

Plus some cleanup