linting, plus small changes