Added another variation on the plugin variable and cleaned up some of the references in the boilerplate file.