plugin updates, misc edits