update grunt, misc edits