adding more plugins and cleaning out cruft