added plugin names & minor changes