Update some files
Clean up more of the re- refactoring of plugins and tags.