Added additional plugin directory global. Cleaned up some redundant calls.