tweaks to linting and combing