build and flake8 corrections